verify_pack: do not ignore return value of verification function
In verify_pack, a caller-supplied verification function is called. The function returns an int. If that return value is non-zero, verify_pack should fail. The only caller of verify_pack is in builtin/fsck.c, whose verify_fn returns a meaningful error code (which was then ignored). Now, fsck might return a different error code (with more detail). This would happen in the unlikely event that a commit or tree that is a valid git object but not a valid instance of its type gets into a pack. Signed-off-by: David Turner <dturner@twopensource.com> Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
parent
908a6e4156
commit
8c24d832cd
@ -126,7 +126,7 @@ static int verify_packfile(struct packed_git *p,
|
|||||||
sha1_to_hex(entries[i].sha1), p->pack_name);
|
sha1_to_hex(entries[i].sha1), p->pack_name);
|
||||||
else if (fn) {
|
else if (fn) {
|
||||||
int eaten = 0;
|
int eaten = 0;
|
||||||
fn(entries[i].sha1, type, size, data, &eaten);
|
err |= fn(entries[i].sha1, type, size, data, &eaten);
|
||||||
if (eaten)
|
if (eaten)
|
||||||
data = NULL;
|
data = NULL;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user