Commit 7ed78d42 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #3936 from hiroponz/fix-git-bin-path-in-git-version-check

Config setting should be used in git version check.
parents d32c19b2 06805fff
...@@ -668,8 +668,9 @@ namespace :gitlab do ...@@ -668,8 +668,9 @@ namespace :gitlab do
def check_git_version def check_git_version
required_version = Gitlab::VersionInfo.new(1, 7, 10) 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} ? ... " print "Git version >= #{required_version} ? ... "
if required_version <= current_version if required_version <= current_version
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment