Re: [PATCH] fsck: exit with non-zero status upon error from fsck_obj()
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 9, 2014, 22:21 UTC
- Message-ID
- <xmqqvbowigeh.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <xmqq4mwgjvt6.fsf_-_@gitster.dls.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 7 quoted lines
> From: Jeff King <peff@peff.net> > Date: Fri, 29 Aug 2014 16:31:46 -0400 > > Upon finding a corrupt loose object, we forgot to note the error to > signal it with the exit status of the entire process. > > [jc: adjusted t1450 and added another test]
Spoke too soon. If found another instance where we expected fsck to notice a corruption. We'd need to squash this in.
By the way, Jonathan, with dbedf8bf (t1450 (fsck): remove dangling objects, 2010-09-06) you added a 'test_might_fail git fsck' to the 1450 test that catches an object corruption. Do you remember if there was some flakiness in this test that necessitated it, or is it merely "I think this should fail, but it does not, and we may fix it some day but I am not doing that in this patch?" Assuming that it is the latter, I am including an update to 1450 as well.
There is another test_might_fail that runs "git rev-list" in the same test, but that is not part of the said patch and unrelated to the current topic, so I didn't dig further; we may want to audit the hits from "git grep test_might_fail t/" as a separate topic (hint, hint).
t/t1450-fsck.sh | 2 +- t/t4212-log-corrupt.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index c8dff9c..0de755c 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -69,7 +69,7 @@ test_expect_success 'object with bad sha1' ' git update-ref refs/heads/bogus $cmt && test_when_finished "git update-ref -d refs/heads/bogus" && - test_might_fail git fsck 2>out && + test_must_fail git fsck 2>out && cat out && grep "$sha.*corrupt" out ' diff --git a/t/t4212-log-corrupt.sh b/t/t4212-log-corrupt.sh index 58b792b..67bd8ec 100755 --- a/t/t4212-log-corrupt.sh +++ b/t/t4212-log-corrupt.sh @@ -14,7 +14,7 @@ test_expect_success 'setup' ' ' test_expect_success 'fsck notices broken commit' ' - git fsck 2>actual && + test_must_fail git fsck 2>actual && test_i18ngrep invalid.author actual '