diff options
| author | Elijah Newren <newren@gmail.com> | 2016-04-10 09:13:35 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-13 04:23:23 +0300 |
| commit | 3efc61add5c5656f0d74cde2b0ff07dd6acb6784 (patch) | |
| tree | 470ddbf1a07d3bf42afb3c7ae3375d6aad7fe8d5 /merge-recursive.c | |
| parent | 7b0d47b3b6b5b64e02a5aa06b0452cadcdb18355 (diff) | |
merge-recursive: remove duplicate code
In commit 51931bf (merge-recursive: Improve handling of rename
target vs. directory addition, 2011-08-11), I apparently added two
lines of code that were immediately duplicated a few lines later.
No idea why, other than it seems pretty clear this was a mistake:
there is no need to remove the same file twice; removing it once is
sufficient...especially since the intervening line was working with
a different file entirely.
Signed-off-by: Elijah Newren <newren@gmail.com>
Reviewed-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index b880ae50e7..d4292deb5e 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1773,8 +1773,6 @@ static int process_entry(struct merge_options *o, output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. " "Adding %s as %s"), conf, path, other_branch, path, new_path); - if (o->call_depth) - remove_file_from_cache(path); update_file(o, 0, sha, mode, new_path); if (o->call_depth) remove_file_from_cache(path); |