fsck: call fsck_finish() after fscking objects

Now that the internal fsck code is capable of checking
.gitmodules files, we just need to teach its callers to use
the "finish" function to check any queued objects.

With this, we can now catch the malicious case in t7415 with
git-fsck.

Signed-off-by: Jeff King <peff@peff.net>

diff --git a/builtin/fsck.c b/builtin/fsck.c
index f91d5f360dd016505562a9d4380369aa8faee5f5..028aba52ebaab764d1f4f91c926e54d66dcaa20f 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -748,6 +748,9 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
                        }
                        stop_progress(&progress);
                }
+
+               if (fsck_finish(&fsck_obj_options))
+                       errors_found |= ERROR_OBJECT;
        }
 
        for (i = 0; i < argc; i++) {

diff --git a/t/t7415-submodule-names.sh b/t/t7415-submodule-names.sh
index 75fa071c6d042aad43d3255935c1d99324073a31..c8ce2f4717f3305c4b82914deab894d849e25836 100755 (executable)
--- a/t/t7415-submodule-names.sh
+++ b/t/t7415-submodule-names.sh
@@ -73,4 +73,8 @@ test_expect_success 'clone evil superproject' '
        ! grep "RUNNING POST CHECKOUT" output
 '
 
+test_expect_success 'fsck detects evil superproject' '
+       test_must_fail git fsck
+'
+
 test_done