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>

diff --git a/fsck.c b/fsck.c
index aa7a52cc801f219d3b71bbffedc655a22456bbfa..87b0e228bd091e53fc1ad201948877d324b3b881 100644 (file)
--- a/fsck.c
+++ b/fsck.c
@@ -992,6 +992,7 @@ static int fsck_blob(struct blob *blob, const char *buf,
                     unsigned long size, struct fsck_options *options)
 {
        struct fsck_gitmodules_data data;
                     unsigned long size, struct fsck_options *options)
 {
        struct fsck_gitmodules_data data;

+       struct config_options config_opts = { 0 };

 
        if (!oidset_contains(&gitmodules_found, &blob->object.oid))
                return 0;
 
        if (!oidset_contains(&gitmodules_found, &blob->object.oid))
                return 0;


@@ -1011,8 +1012,9 @@ static int fsck_blob(struct blob *blob, const char *buf,
        data.obj = &blob->object;
        data.options = options;
        data.ret = 0;
        data.obj = &blob->object;
        data.options = options;
        data.ret = 0;

+       config_opts.error_action = CONFIG_ERROR_SILENT;

        if (git_config_from_mem(fsck_gitmodules_fn, CONFIG_ORIGIN_BLOB,
        if (git_config_from_mem(fsck_gitmodules_fn, CONFIG_ORIGIN_BLOB,

-                               ".gitmodules", buf, size, &data, NULL))
+                               ".gitmodules", buf, size, &data, &config_opts))

                data.ret |= report(options, &blob->object,
                                   FSCK_MSG_GITMODULES_PARSE,
                                   "could not parse gitmodules blob");
                data.ret |= report(options, &blob->object,
                                   FSCK_MSG_GITMODULES_PARSE,
                                   "could not parse gitmodules blob");

diff --git a/t/t7415-submodule-names.sh b/t/t7415-submodule-names.sh
index b68c5f5e8510ddbf4e10f6cb608d9e789bef09b4..ba8af785a5dc19de5403127ec5d62e62960bf775 100755 (executable)
--- 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
 test_done