summaryrefslogtreecommitdiff
path: root/t/t7415-submodule-names.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2018-06-28 22:06:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-03 16:36:41 (GMT)
commitde6bd9e3eab3077d49d8486f990ed2b80af7c2c9 (patch)
tree31ea4c72bd4bae1441a78ab17aca15aa96adee90 /t/t7415-submodule-names.sh
parent4574f1aace4ca53ac0fc63a545383dab1a71fec9 (diff)
downloadgit-de6bd9e3eab3077d49d8486f990ed2b80af7c2c9.zip
git-de6bd9e3eab3077d49d8486f990ed2b80af7c2c9.tar.gz
git-de6bd9e3eab3077d49d8486f990ed2b80af7c2c9.tar.bz2
fsck: silence stderr when parsing .gitmodules
If there's a parsing error we'll already report it via the usual fsck report() function (or not, if the user has asked to skip this object or warning type). The error message from the config parser just adds confusion. Let's suppress it. Note that we didn't test this case at all, so I've added coverage in t7415. We may end up toning down or removing this fsck check in the future. So take this test as checking what happens now with a focus on stderr, and not any ironclad guarantee that we must detect and report parse failures in the future. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7415-submodule-names.sh')
-rwxr-xr-xt/t7415-submodule-names.sh15
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t7415-submodule-names.sh b/t/t7415-submodule-names.sh
index b68c5f5..ba8af78 100755
--- a/t/t7415-submodule-names.sh
+++ b/t/t7415-submodule-names.sh
@@ -176,4 +176,19 @@ test_expect_success 'fsck detects non-blob .gitmodules' '
)
'
+test_expect_success 'fsck detects corrupt .gitmodules' '
+ git init corrupt &&
+ (
+ cd corrupt &&
+
+ echo "[broken" >.gitmodules &&
+ git add .gitmodules &&
+ git commit -m "broken gitmodules" &&
+
+ test_must_fail git fsck 2>output &&
+ grep gitmodulesParse output &&
+ test_i18ngrep ! "bad config" output
+ )
+'
+
test_done