Merge branch 'jc/pack-heuristics'

* jc/pack-heuristics:
  pack-objects: tweak "do not even attempt delta" heuristics
This commit is contained in:
Junio C Hamano 2006-11-24 03:46:44 -08:00
commit 9919b5ea8c

View File

@ -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;
/*