consider previous pack undeltified object state only when reusing delta data

Without this there would never be a chance to improve packing for
previously undeltified objects.

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/pack-objects.c b/pack-objects.c
index 6e1767652c886d48781f7fbeb9599d57b1de09c7..47da33baa3fb70a6a2f117afbcf4e7e08a5806be 100644 (file)
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -989,9 +989,10 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
 
        /*
         * We do not bother to try a delta that we discarded
-        * on an earlier try.
+        * on an earlier try, but only when reusing delta data.
         */
-       if (trg_entry->in_pack && trg_entry->in_pack == src_entry->in_pack)
+       if (!no_reuse_delta && trg_entry->in_pack &&
+           trg_entry->in_pack == src_entry->in_pack)
                return 0;
 
        /*