summaryrefslogtreecommitdiff
path: root/builtin-pack-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-09-18 20:19:30 -0700
committerJunio C Hamano <gitster@pobox.com>2008-09-18 20:19:30 -0700
commitc4398286fa5245cf54d73f6016444179d73f140b (patch)
tree7615ae9e816ae37148e70e335a1d95a54216e890 /builtin-pack-objects.c
parent8435bdfdc3dca1b19721e013374d936164928e33 (diff)
parent5f020f720298ddba537f857a240ffa7debb05f54 (diff)
downloadgit-c4398286fa5245cf54d73f6016444179d73f140b.tar.gz
Merge branch 'np/pack'
* np/pack: t5300: improve SHA1 collision test pack-objects: don't include missing preferred base objects sha1write: don't copy full sized buffers Conflicts: t/t5300-pack-object.sh
Diffstat (limited to 'builtin-pack-objects.c')
-rw-r--r--builtin-pack-objects.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 217fd49da9..5fc1b8c6fb 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -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;