--- builtin-pack-objects.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) -- Dana L. How danahow@xxxxxxxxx +1 650 804 5991 cell
From 7d510f82b1e6acccc25596052abf3c5f1961ebcc Mon Sep 17 00:00:00 2001 From: Dana How <how@xxxxxxxxxxxxxxxxxxxxxxx> Date: Thu, 5 Apr 2007 14:04:59 -0700 Subject: [PATCH 08/13] prevent try_delta from using objects not in pack --- builtin-pack-objects.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 9eb5fd6..37b0150 100644 --- a/builtin-pack-objects.c +++ b/builtin-pack-objects.c @@ -1251,6 +1251,10 @@ static int try_delta(struct unpacked *trg, struct unpacked *src, if (trg_entry->type != src_entry->type) return -1; + /* Don't try deltas involving already/non written objects */ + if (trg_entry->no_write || src_entry->no_write) + return -1; + /* We do not compute delta to *create* objects we are not * going to pack. */ -- 1.5.1.rc2.18.g9c88-dirty