diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2013-06-02 15:46:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-02 22:31:15 (GMT) |
| commit | 5d80ef5a6e727bbecd7d892a5043bae25f7ca5e2 (patch) | |
| tree | 50909ff4610d22367ee829cbf2adbb1c0c88e8c9 /unpack-trees.c | |
| parent | 5828e8352c07753a1f751322800524bf9dff8679 (diff) | |
| download | git-5d80ef5a6e727bbecd7d892a5043bae25f7ca5e2.zip git-5d80ef5a6e727bbecd7d892a5043bae25f7ca5e2.tar.gz git-5d80ef5a6e727bbecd7d892a5043bae25f7ca5e2.tar.bz2 | |
unpack-trees: free cache_entry array members for merges
The merge functions duplicate entries as needed and they don't free
them. Release them in unpack_nondirectories, the same function
where they were allocated, after we're done.
As suggested by Felipe, use the same loop style (zero-based for loop)
for freeing as for allocating.
Improved-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 2dbc05d..57b4074 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -600,9 +600,16 @@ static int unpack_nondirectories(int n, unsigned long mask, src[i + o->merge] = create_ce_entry(info, names + i, stage); } - if (o->merge) - return call_unpack_fn((const struct cache_entry * const *)src, - o); + if (o->merge) { + int rc = call_unpack_fn((const struct cache_entry * const *)src, + o); + for (i = 0; i < n; i++) { + struct cache_entry *ce = src[i + o->merge]; + if (ce != o->df_conflict_entry) + free(ce); + } + return rc; + } for (i = 0; i < n; i++) if (src[i] && src[i] != o->df_conflict_entry) |