@matheusbsbs / matheus-bagliano / commits / 30d1038d1b

fsck: return non-zero status on missing ref tips

Fsck tries hard to detect missing objects, and will complain (and exit non-zero) about any inter-object links that are missing. However, it will not exit non-zero for any missing ref tips, meaning that a severely broken repository may still pass "git fsck && echo ok". The problem is that we use for_each_ref to iterate over the ref tips, which hides broken tips. It does at least print an error from the refs.c code, but fsck does not ever see the ref and cannot note the problem in its exit code. We can solve this by using for_each_rawref and noting the error ourselves. In addition to adding tests for this case, we add tests for all types of missing-object links (all of which worked, but which we were not testing). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Sep 11, 2014 at 23:38 UTC 30d1038d1bd538bf2f8abfb5f5dccf80327a26c9
2 files changed +58 -1
builtin/fsck.c
+2 -1
@@ -495,6 +495,7 @@ static int fsck_handle_ref(const char *refname, const unsigned char *sha1, int f
495 obj = parse_object(sha1);
496 if (!obj) {
497 error("%s: invalid sha1 pointer %s", refname, sha1_to_hex(sha1));
498 + errors_found |= ERROR_REACHABLE;
499 /* We'll continue with the rest despite the error.. */
500 return 0;
501 }
@@ -511,7 +512,7 @@ static void get_default_heads(void)
512 {
513 if (head_points_at && !is_null_sha1(head_sha1))
514 fsck_handle_ref("HEAD", head_sha1, 0, NULL);
514 - for_each_ref(fsck_handle_ref, NULL);
515 + for_each_rawref(fsck_handle_ref, NULL);
516 if (include_reflogs)
517 for_each_reflog(fsck_handle_reflog, NULL);
518
t/t1450-fsck.sh
+56
@@ -302,4 +302,60 @@ test_expect_success 'fsck notices ".git" in trees' '
302 )
303 '
304
305 +# create a static test repo which is broken by omitting
306 +# one particular object ($1, which is looked up via rev-parse
307 +# in the new repository).
308 +create_repo_missing () {
309 + rm -rf missing &&
310 + git init missing &&
311 + (
312 + cd missing &&
313 + git commit -m one --allow-empty &&
314 + mkdir subdir &&
315 + echo content >subdir/file &&
316 + git add subdir/file &&
317 + git commit -m two &&
318 + unrelated=$(echo unrelated | git hash-object --stdin -w) &&
319 + git tag -m foo tag $unrelated &&
320 + sha1=$(git rev-parse --verify "$1") &&
321 + path=$(echo $sha1 | sed 's|..|&/|') &&
322 + rm .git/objects/$path
323 + )
324 +}
325 +
326 +test_expect_success 'fsck notices missing blob' '
327 + create_repo_missing HEAD:subdir/file &&
328 + test_must_fail git -C missing fsck
329 +'
330 +
331 +test_expect_success 'fsck notices missing subtree' '
332 + create_repo_missing HEAD:subdir &&
333 + test_must_fail git -C missing fsck
334 +'
335 +
336 +test_expect_success 'fsck notices missing root tree' '
337 + create_repo_missing HEAD^{tree} &&
338 + test_must_fail git -C missing fsck
339 +'
340 +
341 +test_expect_success 'fsck notices missing parent' '
342 + create_repo_missing HEAD^ &&
343 + test_must_fail git -C missing fsck
344 +'
345 +
346 +test_expect_success 'fsck notices missing tagged object' '
347 + create_repo_missing tag^{blob} &&
348 + test_must_fail git -C missing fsck
349 +'
350 +
351 +test_expect_success 'fsck notices ref pointing to missing commit' '
352 + create_repo_missing HEAD &&
353 + test_must_fail git -C missing fsck
354 +'
355 +
356 +test_expect_success 'fsck notices ref pointing to missing tag' '
357 + create_repo_missing tag &&
358 + test_must_fail git -C missing fsck
359 +'
360 +
361 test_done