Merge branch 'jc/pack-heuristics'

* jc/pack-heuristics: pack-objects: tweak "do not even attempt delta" heuristics
git-mirror · Nov 24, 2006 · 9919b5e · 9919b5e
2 parents 54acddc + e9195b5
commit 9919b5e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
@@ -1176,7 +1176,9 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
 	 * on an earlier try, but only when reusing delta data.
 	 */
 	if (!no_reuse_delta && trg_entry->in_pack &&
-	    trg_entry->in_pack == src_entry->in_pack)
+	    trg_entry->in_pack == src_entry->in_pack &&
+	    trg_entry->in_pack_type != OBJ_REF_DELTA &&
+	    trg_entry->in_pack_type != OBJ_OFS_DELTA)
 		return 0;
 
 	/*