summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSato Hiroyuki <sathiroyuki@gmail.com>2013-05-14 19:55:08 +0900
committerSato Hiroyuki <sathiroyuki@gmail.com>2013-05-14 19:55:08 +0900
commit06805fff143b9838dd2bab902701867e549783bd (patch)
tree0b028e6f2293c4557a6b346a04e2f5d132740ef4
parentbbd125915ff90909440675a220a78fd41dfab847 (diff)
downloadgitlab-ce-06805fff143b9838dd2bab902701867e549783bd.tar.gz
Config setting should be used in git version check.
-rw-r--r--lib/tasks/gitlab/check.rake3
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