[PATCH 1/6] Remove duplicate code
- From
Elijah Newren <newren@gmail.com>
- Date
- Apr 10, 2016, 06:13 UTC
- Message-ID
- <1460268820-8308-2-git-send-email-newren@gmail.com>
- In-Reply-To
- <1460268820-8308-1-git-send-email-newren@gmail.com>
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> --- merge-recursive.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c index b880ae5..d4292de 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);
-- 2.8.0.21.g229f62a