Merge branch 'dt/fsck-verify-pack-error'
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Dec 2015 20:36:12 +0000 (12:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Dec 2015 20:36:12 +0000 (12:36 -0800)
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

pack-check.c
index 63a595c45c961fce54cca95ab6e09e3336f0bb8e..433bd86ccd5c38ff5a4993be4e1463946aead59d 100644 (file)
@@ -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;
                }