undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsck: exit with non-zero status upon error from fsck_obj()

Browse Source 
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]

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2014-08-29 16:31:46 -04:00 committed by Junio C Hamano
parent d31f3ad23d
commit 2e770fe47e
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/fsck.c
View File

@ -389,7 +389,8 @@ static void fsck_sha1_list(void)
unsigned char *sha1 = entry->sha1; unsigned char *sha1 = entry->sha1;
sha1_list.entry[i] = NULL; sha1_list.entry[i] = NULL;
fsck_sha1(sha1); if (fsck_sha1(sha1))
errors_found |= ERROR_OBJECT;
free(entry); free(entry);
} }
sha1_list.nr = 0; sha1_list.nr = 0;

32
t/t1450-fsck.sh
View File

@ -69,7 +69,7 @@ test_expect_success 'object with bad sha1' '
git update-ref refs/heads/bogus $cmt && git update-ref refs/heads/bogus $cmt &&
test_when_finished "git update-ref -d refs/heads/bogus" && 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 && cat out &&
grep "$sha.*corrupt" out grep "$sha.*corrupt" out
' '
@ -101,7 +101,7 @@ test_expect_success 'email with embedded > is not okay' '
test_when_finished "remove_object $new" && test_when_finished "remove_object $new" &&
git update-ref refs/heads/bogus "$new" && git update-ref refs/heads/bogus "$new" &&
test_when_finished "git update-ref -d refs/heads/bogus" && test_when_finished "git update-ref -d refs/heads/bogus" &&
git fsck 2>out && test_must_fail git fsck 2>out &&
cat out && cat out &&
grep "error in commit $new" out grep "error in commit $new" out
' '
@ -113,7 +113,7 @@ test_expect_success 'missing < email delimiter is reported nicely' '
test_when_finished "remove_object $new" && test_when_finished "remove_object $new" &&
git update-ref refs/heads/bogus "$new" && git update-ref refs/heads/bogus "$new" &&
test_when_finished "git update-ref -d refs/heads/bogus" && test_when_finished "git update-ref -d refs/heads/bogus" &&
git fsck 2>out && test_must_fail git fsck 2>out &&
cat out && cat out &&
grep "error in commit $new.* - bad name" out grep "error in commit $new.* - bad name" out
' '
@ -125,7 +125,7 @@ test_expect_success 'missing email is reported nicely' '
test_when_finished "remove_object $new" && test_when_finished "remove_object $new" &&
git update-ref refs/heads/bogus "$new" && git update-ref refs/heads/bogus "$new" &&
test_when_finished "git update-ref -d refs/heads/bogus" && test_when_finished "git update-ref -d refs/heads/bogus" &&
git fsck 2>out && test_must_fail git fsck 2>out &&
cat out && cat out &&
grep "error in commit $new.* - missing email" out grep "error in commit $new.* - missing email" out
' '
@ -137,7 +137,7 @@ test_expect_success '> in name is reported' '
test_when_finished "remove_object $new" && test_when_finished "remove_object $new" &&
git update-ref refs/heads/bogus "$new" && git update-ref refs/heads/bogus "$new" &&
test_when_finished "git update-ref -d refs/heads/bogus" && test_when_finished "git update-ref -d refs/heads/bogus" &&
git fsck 2>out && test_must_fail git fsck 2>out &&
cat out && cat out &&
grep "error in commit $new" out grep "error in commit $new" out
' '
@ -151,11 +151,31 @@ test_expect_success 'integer overflow in timestamps is reported' '
test_when_finished "remove_object $new" && test_when_finished "remove_object $new" &&
git update-ref refs/heads/bogus "$new" && git update-ref refs/heads/bogus "$new" &&
test_when_finished "git update-ref -d refs/heads/bogus" && test_when_finished "git update-ref -d refs/heads/bogus" &&
git fsck 2>out && test_must_fail git fsck 2>out &&
cat out && cat out &&
grep "error in commit $new.*integer overflow" out grep "error in commit $new.*integer overflow" out
' '
test_expect_success 'malformatted tree object' '
test_when_finished "git update-ref -d refs/tags/wrong" &&
test_when_finished "remove_object \$T" &&
T=$(
GIT_INDEX_FILE=test-index &&
export GIT_INDEX_FILE &&
rm -f test-index &&
>x &&
git add x &&
T=$(git write-tree) &&
(
git cat-file tree $T &&
git cat-file tree $T
) |
git hash-object -w -t tree --stdin
) &&
test_must_fail git fsck 2>out &&
grep "error in tree .*contains duplicate file entries" out
'
test_expect_success 'tag pointing to nonexistent' ' test_expect_success 'tag pointing to nonexistent' '
cat >invalid-tag <<-\EOF && cat >invalid-tag <<-\EOF &&
object ffffffffffffffffffffffffffffffffffffffff object ffffffffffffffffffffffffffffffffffffffff

2
t/t4212-log-corrupt.sh
View File

@ -14,7 +14,7 @@ test_expect_success 'setup' '
' '
test_expect_success 'fsck notices broken commit' ' test_expect_success 'fsck notices broken commit' '
git fsck 2>actual && test_must_fail git fsck 2>actual &&
test_i18ngrep invalid.author actual test_i18ngrep invalid.author actual
' '