Skip to content

Commit

Permalink
Merge branch 'dt/fsck-verify-pack-error' into maint
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Junio C Hamano committed Dec 15, 2015
2 parents de301c5 + 8c24d83 commit a61fd3f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pack-check.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit a61fd3f

Please sign in to comment.