[PATCH 2/2] submodule: Tolerate auto/safecrlf when adding .gitmodules
- From
Brad King <brad.king@kitware.com>
- Date
- Jun 20, 2012, 14:43 UTC
- Message-ID
- <eebc8b3692f8fcb95cf75278f7c9f9982e8f2cd6.1340202515.git.brad.king@kitware.com>
- In-Reply-To
- <cover.1340202515.git.brad.king@kitware.com>
Temporarily disable 'core.safecrlf' to add '.gitmodules' so that 'git add' does not reject the LF newlines we write to the file even if both 'core.autocrlf' and 'core.safecrlf' are enabled. This fixes known breakage tested in t7400-submodule-basic.
Signed-off-by: Brad King <brad.king@kitware.com> --- git-submodule.sh | 2 +- t/t7400-submodule-basic.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh index 5c61ae2..ed9a54a 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -303,7 +303,7 @@ Use -f if you really want to add it." >&2 git config -f .gitmodules submodule."$sm_path".path "$sm_path" && git config -f .gitmodules submodule."$sm_path".url "$repo" && - git add --force .gitmodules || + git -c core.safecrlf=false add --force .gitmodules || die "$(eval_gettext "Failed to register submodule '\$sm_path'")" } diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 5eaeb04..9a4da9b 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -99,7 +99,7 @@ test_expect_success 'submodule add' ' test_cmp empty untracked ' -test_expect_failure 'submodule add with core.autocrlf and core.safecrlf' ' +test_expect_success 'submodule add with core.autocrlf and core.safecrlf' ' ( cd addtest-crlf && git config core.autocrlf true &&
-- 1.7.10