summaryrefslogtreecommitdiff
path: root/builtin-pack-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-27 13:03:50 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-27 13:03:50 -0800
commit3d0a936f63f2f894b3986d96cdd8f2baae96150c (patch)
treef661256c3756d9d74ea2cd045115e5488f53388f /builtin-pack-objects.c
parent60b188a9844cdcf865174c685a38acc053a9d43b (diff)
parent8e0f70033b2bd1679a6e5971978fdc3ee09bdb72 (diff)
downloadgit-3d0a936f63f2f894b3986d96cdd8f2baae96150c.tar.gz
Merge branch 'jm/free'
* jm/free: Avoid unnecessary "if-before-free" tests. Conflicts: builtin-branch.c
Diffstat (limited to 'builtin-pack-objects.c')
-rw-r--r--builtin-pack-objects.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 586ae11975..1bba6e6a64 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -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;