pack-objects: don't include missing preferred base objects
authorNicolas Pitre <nico@cam.org>
Tue, 2 Sep 2008 14:22:21 +0000 (10:22 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Sep 2008 00:05:54 +0000 (17:05 -0700)
This improves commit 6d6f9cddbe a bit by simply not including missing
bases in the list of objects to process at all.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-pack-objects.c

index ba2cf00f5ec60bcfcefe120746422f086559a1ae..e16b7e8f06faeee4e9d078e8401b615b6ce02be7 100644 (file)
@@ -1725,6 +1725,14 @@ static void prepare_pack(int window, int depth)
                        if (entry->type < 0)
                                die("unable to get type of object %s",
                                    sha1_to_hex(entry->idx.sha1));
+               } else {
+                       if (entry->type < 0) {
+                               /*
+                                * This object is not found, but we
+                                * don't have to include it anyway.
+                                */
+                               continue;
+                       }
                }
 
                delta_list[n++] = entry;