mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jm/free'

Browse Source 
* jm/free:
  Avoid unnecessary "if-before-free" tests.

Conflicts:

	builtin-branch.c
This commit is contained in:
Junio C Hamano
2008-02-27 13:03:50 -08:00
parent 60b188a984 8e0f70033b
commit 3d0a936f63
17 changed files with 27 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin-pack-objects.c
View File

@ -1429,8 +1429,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
* accounting lock. Compiler will optimize the strangeness
* away when THREADED_DELTA_SEARCH is not defined.
*/
if (trg_entry->delta_data)
free(trg_entry->delta_data);
free(trg_entry->delta_data);
cache_lock();
if (trg_entry->delta_data) {
delta_cache_size -= trg_entry->delta_size;