mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
pack-objects: fix delta cache size accounting
The wrong value was substracted from delta_cache_size when replacing a cached delta, as trg_entry->delta_size was used after the old size had been replaced by the new size. Noticed by Linus. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
2099bca9ed
commit
b7a28f7827
|
@ -1422,10 +1422,6 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
|
|||
}
|
||||
}
|
||||
|
||||
trg_entry->delta = src_entry;
|
||||
trg_entry->delta_size = delta_size;
|
||||
trg->depth = src->depth + 1;
|
||||
|
||||
/*
|
||||
* Handle memory allocation outside of the cache
|
||||
* accounting lock. Compiler will optimize the strangeness
|
||||
|
@ -1439,7 +1435,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
|
|||
trg_entry->delta_data = NULL;
|
||||
}
|
||||
if (delta_cacheable(src_size, trg_size, delta_size)) {
|
||||
delta_cache_size += trg_entry->delta_size;
|
||||
delta_cache_size += delta_size;
|
||||
cache_unlock();
|
||||
trg_entry->delta_data = xrealloc(delta_buf, delta_size);
|
||||
} else {
|
||||
|
@ -1447,6 +1443,10 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
|
|||
free(delta_buf);
|
||||
}
|
||||
|
||||
trg_entry->delta = src_entry;
|
||||
trg_entry->delta_size = delta_size;
|
||||
trg->depth = src->depth + 1;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue