Merge branch 'jk/maint-for-each-packed-object' into jk/cat-file-batch-all

* jk/maint-for-each-packed-object:
for_each_packed_object: automatically open pack index

diff --git a/sha1_file.c b/sha1_file.c
index 7e38148fe52959e1cb8435132c65491dba6850b0..d0b26a0565008af0b276d0faeeda7f24b6cd4803 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -3566,14 +3566,19 @@ int for_each_packed_object(each_packed_object_fn cb, void *data, unsigned flags)
 {
        struct packed_git *p;
        int r = 0;
+       int pack_errors = 0;
 
        prepare_packed_git();
        for (p = packed_git; p; p = p->next) {
                if ((flags & FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local)
                        continue;
+               if (open_pack_index(p)) {
+                       pack_errors = 1;
+                       continue;
+               }
                r = for_each_object_in_pack(p, cb, data);
                if (r)
                        break;
        }
-       return r;
+       return r ? r : pack_errors;
 }

diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index 0794d33dad6cddcb6be58663c16cbe67be600e47..023d7c6f7b6008536cbd83b1873f0b00b9148bbd 100755 (executable)
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -218,6 +218,7 @@ test_expect_success 'gc: prune old objects after local clone' '
 '
 
 test_expect_success 'garbage report in count-objects -v' '
+       test_when_finished "rm -f .git/objects/pack/fake*" &&
        : >.git/objects/pack/foo &&
        : >.git/objects/pack/foo.bar &&
        : >.git/objects/pack/foo.keep &&