Commit dbb1cb30 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #7441 from bbodenmiller/patch-7

add git config --global core.autocrlf check
parents 9f3a5970 ecd33c9d
...@@ -318,7 +318,8 @@ namespace :gitlab do ...@@ -318,7 +318,8 @@ namespace :gitlab do
options = { options = {
"user.name" => "GitLab", "user.name" => "GitLab",
"user.email" => Gitlab.config.gitlab.email_from "user.email" => Gitlab.config.gitlab.email_from,
"core.autocrlf" => "input"
} }
correct_options = options.map do |name, value| correct_options = options.map do |name, value|
run(%W(git config --global --get #{name})).try(:squish) == value run(%W(git config --global --get #{name})).try(:squish) == value
...@@ -330,7 +331,8 @@ namespace :gitlab do ...@@ -330,7 +331,8 @@ namespace :gitlab do
puts "no".red puts "no".red
try_fixing_it( try_fixing_it(
sudo_gitlab("git config --global user.name \"#{options["user.name"]}\""), 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 user.email \"#{options["user.email"]}\""),
sudo_gitlab("git config --global core.autocrlf \"#{options["core.autocrlf"]}\"")
) )
for_more_information( for_more_information(
see_installation_guide_section "GitLab" see_installation_guide_section "GitLab"
......
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