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>
Elijah Newren committed
Apr 9, 2016 at 23:13 UTC
3efc61add5c5656f0d74cde2b0ff07dd6acb6784
1 file changed
-2
merge-recursive.c
-2
@@ -1773,8 +1773,6 @@ static int process_entry(struct merge_options *o,
1773
output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
1774
"Adding %s as %s"),
1775
conf, path, other_branch, path, new_path);
1776
- if (o->call_depth)
1777
- remove_file_from_cache(path);
1776
update_file(o, 0, sha, mode, new_path);
1777
if (o->call_depth)
1778
remove_file_from_cache(path);