summaryrefslogtreecommitdiff
path: root/pack-check.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-12-10 12:36:12 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-12-10 12:36:12 -0800
commitb12a966eff3f66337f83c117dbab8fa0cca16e4b (patch)
treebccd3dd1065f53548c7931ea8c16ab5d2fd1d51d /pack-check.c
parentMerge branch 'ls/travis-yaml' (diff)
parentverify_pack: do not ignore return value of verification function (diff)
downloadtgif-b12a966eff3f66337f83c117dbab8fa0cca16e4b.tar.xz
Merge branch 'dt/fsck-verify-pack-error'
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
Diffstat (limited to 'pack-check.c')
-rw-r--r--pack-check.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pack-check.c b/pack-check.c
index 63a595c45c..433bd86ccd 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;
}