summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-12-15 17:42:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-12-15 17:42:20 (GMT)
commita61fd3fc3f9a865578a8a13dfe8bfd021aad5e30 (patch)
treee7b6354b3116678f5bcecf5c4c27832a4285269f
parentde301c5c85b333751a21b3d6b8cff566dc31e6c9 (diff)
parent8c24d832cdcc1602fb5c7e7295447f8043879bf7 (diff)
downloadgit-a61fd3fc3f9a865578a8a13dfe8bfd021aad5e30.zip
git-a61fd3fc3f9a865578a8a13dfe8bfd021aad5e30.tar.gz
git-a61fd3fc3f9a865578a8a13dfe8bfd021aad5e30.tar.bz2
Merge branch 'dt/fsck-verify-pack-error' into maint
The exit code of git-fsck didnot reflect some types of errors found in packed objects, which has been corrected. * dt/fsck-verify-pack-error: verify_pack: do not ignore return value of verification function
-rw-r--r--pack-check.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pack-check.c b/pack-check.c
index 63a595c..433bd86 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -126,7 +126,7 @@ static int verify_packfile(struct packed_git *p,
sha1_to_hex(entries[i].sha1), p->pack_name);
else if (fn) {
int eaten = 0;
- fn(entries[i].sha1, type, size, data, &eaten);
+ err |= fn(entries[i].sha1, type, size, data, &eaten);
if (eaten)
data = NULL;
}