aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/fsck.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2018-05-02 17:20:35 -0400
committerJeff King <peff@peff.net>2018-05-21 23:55:12 -0400
commit1995b5e03e1cc97116be58cdc0502d4a23547856 (patch)
tree1d482dcd90f29be2e5758dc3aa1c5dc4eec479d3 /builtin/fsck.c
parented8b10f631c9a71df3351d46187bf7f3fa4f9b7e (diff)
downloadgit-1995b5e03e1cc97116be58cdc0502d4a23547856.tar.gz
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>
Diffstat (limited to 'builtin/fsck.c')
-rw-r--r--builtin/fsck.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c
index f91d5f360d..028aba52eb 100644
--- 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++) {