Skip to content

Commit

Permalink
Merge branch 'jc/pack-heuristics'
Browse files Browse the repository at this point in the history
* jc/pack-heuristics:
  pack-objects: tweak "do not even attempt delta" heuristics
  • Loading branch information
Junio C Hamano committed Nov 24, 2006
2 parents 54acddc + e9195b5 commit 9919b5e
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion builtin-pack-objects.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand Down

0 comments on commit 9919b5e

Please sign in to comment.