undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: remove duplicate code

Browse Source 
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>
This commit is contained in:
Elijah Newren 2016-04-09 23:13:35 -07:00 committed by Junio C Hamano
parent 7b0d47b3b6
commit 3efc61add5
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
merge-recursive.c
View File

@ -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. " output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
"Adding %s as %s"), "Adding %s as %s"),
conf, path, other_branch, path, new_path); conf, path, other_branch, path, new_path);
if (o->call_depth)
remove_file_from_cache(path);
update_file(o, 0, sha, mode, new_path); update_file(o, 0, sha, mode, new_path);
if (o->call_depth) if (o->call_depth)
remove_file_from_cache(path); remove_file_from_cache(path);