diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-14 04:37:14 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-05-14 04:37:14 -0700 |
| commit | 7ed78d4200e56e727ea6ab7702558249197e5525 (patch) | |
| tree | affdc80a8693710752bcb83b566f56edf0279fc6 | |
| parent | d32c19b2d969091ee3020620c46e39a558d406e1 (diff) | |
| parent | 06805fff143b9838dd2bab902701867e549783bd (diff) | |
| download | gitlab-ce-7ed78d4200e56e727ea6ab7702558249197e5525.tar.gz | |
Merge pull request #3936 from hiroponz/fix-git-bin-path-in-git-version-check
Config setting should be used in git version check.
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 4a2789b55aa..77f5c02be2e 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -668,8 +668,9 @@ namespace :gitlab do def check_git_version required_version = Gitlab::VersionInfo.new(1, 7, 10) - current_version = Gitlab::VersionInfo.parse(run("git --version")) + current_version = Gitlab::VersionInfo.parse(run("#{Gitlab.config.git.bin_path} --version")) + puts "Your git bin path is \"#{Gitlab.config.git.bin_path}\"" print "Git version >= #{required_version} ? ... " if required_version <= current_version |