@matheusbsbs / matheus-bagliano / commits / ff4056bbc3

prune: turn on ref_paranoia flag

Prune should know about broken objects at the tips of refs, so that we can feed them to our traversal rather than ignoring them. It's better for us to abort the operation on the broken object than it is to start deleting objects with an incomplete view of the reachability namespace. Note that for missing objects, aborting is the best we can do. For a badly-named ref, we technically could use its sha1 as a reachability tip. However, the iteration code just feeds us a null sha1, so there would be a reasonable amount of code involved to pass down our wishes. It's not really worth trying to do better, because this is a case that should happen extremely rarely, and the message we provide: fatal: unable to parse object: refs/heads/bogus:name is probably enough to point the user in the right direction. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Mar 20, 2015 at 14:43 UTC ff4056bbc35aa499f449cbab46702a76cea0e532

2 files changed +3 -2

builtin/prune.c

@@ -115,6 +115,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix)

115 expire = ULONG_MAX;

116 save_commit_buffer = 0;

117 check_replace_refs = 0;

118 + ref_paranoia = 1;

119 init_revisions(&revs, prefix);

120

121 argc = parse_options(argc, argv, prefix, options, prune_usage, 0);

t/t5312-prune-corruption.sh

+2 -2

@@ -25,7 +25,7 @@ test_expect_success 'create history reachable only from a bogus-named ref' '

25 git reset --hard HEAD^

26 '

28 -test_expect_failure 'pruning does not drop bogus object' '

28 +test_expect_success 'pruning does not drop bogus object' '

29 test_when_finished "git hash-object -w -t commit saved" &&

30 test_might_fail git prune --expire=now &&

31 verbose git cat-file -e $bogus

@@ -72,7 +72,7 @@ test_expect_success 'create history with missing tip commit' '

72 test_must_fail git cat-file -e $missing

73 '

75 -test_expect_failure 'pruning with a corrupted tip does not drop history' '

75 +test_expect_success 'pruning with a corrupted tip does not drop history' '

76 test_when_finished "git hash-object -w -t commit saved" &&

77 test_might_fail git prune --expire=now &&

78 verbose git cat-file -e $recoverable