From ecd33c9d92b6b4f4e69f70b168d816f6105428ac Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Mon, 4 Aug 2014 20:41:20 -0700
Subject: [PATCH] add git config --global core.autocrlf check
core.autocrlf was added to install guide in https://github.com/gitlabhq/gitlabhq/commit/2d681c0d1ed14bf23c041aa04fa3e77caceda9a1 but not added to check script
---
lib/tasks/gitlab/check.rake | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 3f219261abea1..032ed5ee370ad 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -318,7 +318,8 @@ namespace :gitlab do
options = {
"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|
run(%W(git config --global --get #{name})).try(:squish) == value
@@ -330,7 +331,8 @@ namespace :gitlab do
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 user.email \"#{options["user.email"]}\""),
+ sudo_gitlab("git config --global core.autocrlf \"#{options["core.autocrlf"]}\"")
)
for_more_information(
see_installation_guide_section "GitLab"
--
GitLab