Merge branch 'jc/pack-heuristics'

* jc/pack-heuristics: pack-objects: tweak "do not even attempt delta" heuristics
19 years ago · 9919b5ea8c
1 changed files with 3 additions and 1 deletions
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@ -1176,7 +1176,9 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
				@@ -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;

 	/*