Re: [RFC/PATCH 01/18] Remove duplicate code

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 8, 2016, 23:34 UTC
Message-ID: <xmqqvb3ru13r.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1460098726-5958-2-git-send-email-newren@gmail.com>

Elijah Newren <newren@gmail.com> writes:

> Subject: Re: [RFC/PATCH 01/18] Remove duplicate code

Subject: [RFC/PATCH 01/18] merge-recursive: remove duplicate code

Show 6 quoted lines

> 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.

Interesting.

I briefly wondered if the update_files() in the middle may be prevented by D/F conflict if you didn't remove the path beforehand, but path and new_path are both in the same directory, so that would not be the reason. Checking out 51931bf and running two tests (6022 and 6042) that were modified to protect the fix after applying this partial revert does not seem to break, either, so...

Reviewed-by: Junio C Hamano <gitster@pobox.com>

Show 19 quoted lines

>
> Signed-off-by: Elijah Newren <newren@gmail.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);