From: Brad King <brad.king@kitware.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH 1/2] submodule: Demonstrate failure to add with auto/safecrlf
Date: Wed, 20 Jun 2012 10:43:32 -0400 [thread overview]
Message-ID: <7b51d857a351dd0d4972b62b5ba52a7df6bfd988.1340202515.git.brad.king@kitware.com> (raw)
In-Reply-To: <cover.1340202515.git.brad.king@kitware.com>
If 'core.autocrlf' and 'core.safecrlf' are both enabled then
'git submodule add' fails with an error such as
fatal: LF would be replaced by CRLF in .gitmodules
Failed to register submodule 'submod'
because it generates a '.gitmodules' file with LF newlines that are
rejected by 'git add' under this configuration. Demonstrate this known
breakage with a new test in t7400-submodule-basic covering the case.
Signed-off-by: Brad King <brad.king@kitware.com>
---
t/t7400-submodule-basic.sh | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 81827e6..5eaeb04 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -43,6 +43,7 @@ test_expect_success 'setup - hide init subdirectory' '
test_expect_success 'setup - repository to add submodules to' '
git init addtest &&
+ git init addtest-crlf &&
git init addtest-ignore
'
@@ -98,6 +99,18 @@ test_expect_success 'submodule add' '
test_cmp empty untracked
'
+test_expect_failure 'submodule add with core.autocrlf and core.safecrlf' '
+ (
+ cd addtest-crlf &&
+ git config core.autocrlf true &&
+ git config core.safecrlf true &&
+ git submodule add "$submodurl" submod &&
+ echo ".gitmodules" >expect &&
+ git ls-files -- .gitmodules >actual &&
+ test_cmp expect actual
+ )
+'
+
test_expect_success 'submodule add to .gitignored path fails' '
(
cd addtest-ignore &&
--
1.7.10
next prev parent reply other threads:[~2012-06-20 14:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-20 14:43 [PATCH 0/2] submodule add + autocrlf + safecrlf Brad King
2012-06-20 14:43 ` Brad King [this message]
2012-06-20 14:43 ` [PATCH 2/2] submodule: Tolerate auto/safecrlf when adding .gitmodules Brad King
2012-06-20 17:52 ` Jens Lehmann
2012-06-20 18:06 ` Brad King
2012-06-20 18:21 ` Jens Lehmann
2012-06-20 19:11 ` Jeff King
2012-06-20 19:53 ` Junio C Hamano
2012-06-21 19:06 ` Jens Lehmann
2012-06-20 17:49 ` [PATCH 0/2] submodule add + autocrlf + safecrlf Junio C Hamano
2012-06-20 18:09 ` Brad King
2012-06-20 19:24 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7b51d857a351dd0d4972b62b5ba52a7df6bfd988.1340202515.git.brad.king@kitware.com \
--to=brad.king@kitware.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).