Merge pull request #7470 from bbodenmiller/patch-1
change git to git bin path
This commit is contained in:
commit
e088777e1b
|
@ -322,7 +322,7 @@ namespace :gitlab do
|
|||
"core.autocrlf" => "input"
|
||||
}
|
||||
correct_options = options.map do |name, value|
|
||||
run(%W(git config --global --get #{name})).try(:squish) == value
|
||||
run(%W(#{Gitlab.config.git.bin_path} config --global --get #{name})).try(:squish) == value
|
||||
end
|
||||
|
||||
if correct_options.all?
|
||||
|
@ -330,9 +330,9 @@ namespace :gitlab do
|
|||
else
|
||||
puts "no".red
|
||||
try_fixing_it(
|
||||
sudo_gitlab("git config --global user.name \"#{options["user.name"]}\""),
|
||||
sudo_gitlab("git config --global user.email \"#{options["user.email"]}\""),
|
||||
sudo_gitlab("git config --global core.autocrlf \"#{options["core.autocrlf"]}\"")
|
||||
sudo_gitlab("\"#{Gitlab.config.git.bin_path}\" config --global user.name \"#{options["user.name"]}\""),
|
||||
sudo_gitlab("\"#{Gitlab.config.git.bin_path}\" config --global user.email \"#{options["user.email"]}\""),
|
||||
sudo_gitlab("\"#{Gitlab.config.git.bin_path}\" config --global core.autocrlf \"#{options["core.autocrlf"]}\"")
|
||||
)
|
||||
for_more_information(
|
||||
see_installation_guide_section "GitLab"
|
||||
|
|
Loading…
Reference in New Issue