diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-11-24 11:46:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-11-24 11:46:44 (GMT) |
| commit | 9919b5ea8cfcd709b72e731af2ae62e011954ed9 (patch) | |
| tree | b711d04c095e7148380f1ee16fa05725eba87074 | |
| parent | 54acddce99ee0260b7b0a47fda3e2f74c3b983c3 (diff) | |
| parent | e9195b584f6ad49b637b56be0705a7362a95d692 (diff) | |
| download | git-9919b5ea8cfcd709b72e731af2ae62e011954ed9.zip git-9919b5ea8cfcd709b72e731af2ae62e011954ed9.tar.gz git-9919b5ea8cfcd709b72e731af2ae62e011954ed9.tar.bz2 | |
Merge branch 'jc/pack-heuristics'
* jc/pack-heuristics:
pack-objects: tweak "do not even attempt delta" heuristics
| -rw-r--r-- | builtin-pack-objects.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c index 69e5dd3..753bcd5 100644 --- 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; /* |