Commit 7ed78d4200e56e727ea6ab7702558249197e5525
Exists in
master
and in
4 other branches
Merge pull request #3936 from hiroponz/fix-git-bin-path-in-git-version-check
Config setting should be used in git version check.
Showing
1 changed file
with
2 additions
and
1 deletions
Show diff stats
lib/tasks/gitlab/check.rake
| @@ -668,8 +668,9 @@ namespace :gitlab do | @@ -668,8 +668,9 @@ namespace :gitlab do | ||
| 668 | 668 | ||
| 669 | def check_git_version | 669 | def check_git_version |
| 670 | required_version = Gitlab::VersionInfo.new(1, 7, 10) | 670 | required_version = Gitlab::VersionInfo.new(1, 7, 10) |
| 671 | - current_version = Gitlab::VersionInfo.parse(run("git --version")) | 671 | + current_version = Gitlab::VersionInfo.parse(run("#{Gitlab.config.git.bin_path} --version")) |
| 672 | 672 | ||
| 673 | + puts "Your git bin path is \"#{Gitlab.config.git.bin_path}\"" | ||
| 673 | print "Git version >= #{required_version} ? ... " | 674 | print "Git version >= #{required_version} ? ... " |
| 674 | 675 | ||
| 675 | if required_version <= current_version | 676 | if required_version <= current_version |