diff options
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 2dbc05d7f..57b40743a 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) |