undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bd/delta'

Browse Source 
* bd/delta:
  pack-objects: Prefer shallower deltas if the size is equal
This commit is contained in:
Junio C Hamano 2007-07-09 23:44:45 -07:00
commit baa79ca42d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin-pack-objects.c
View File

@ -1337,7 +1337,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
if (max_size == 0) if (max_size == 0)
return 0; return 0;
if (trg_entry->delta && trg_entry->delta_size <= max_size) if (trg_entry->delta && trg_entry->delta_size <= max_size)
max_size = trg_entry->delta_size-1; max_size = trg_entry->delta_size;
src_size = src_entry->size; src_size = src_entry->size;
sizediff = src_size < trg_size ? trg_size - src_size : 0; sizediff = src_size < trg_size ? trg_size - src_size : 0;
if (sizediff >= max_size) if (sizediff >= max_size)
@ -1371,6 +1371,12 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
return 0; return 0;
if (trg_entry->delta_data) { if (trg_entry->delta_data) {
/* Prefer only shallower same-sized deltas. */
if (delta_size == trg_entry->delta_size &&
src_entry->depth + 1 >= trg_entry->depth) {
free(delta_buf);
return 0;
}
delta_cache_size -= trg_entry->delta_size; delta_cache_size -= trg_entry->delta_size;
free(trg_entry->delta_data); free(trg_entry->delta_data);
} }