From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 08 Nov 2018 05:25:24 GMT
Subject: Re: [PATCH v5 10/10] merge-recursive: combine error handling
Message-ID: <xmqq8t2487jv.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20181108044031.25885-11-newren@gmail.com>

Elijah Newren <newren@gmail.com> writes:

> From: Derrick Stolee <stolee@gmail.com>
>
> In handle_rename_rename_1to2(), we have duplicated error handling
> around colliding paths. Specifically, when we want to write out
> the file and there is a directory or untracked file in the way,
> we need to create a temporary file to hold the contents. This has
> some special output to alert the user, and this output is
> duplicated for each side of the conflict.
>
> Simplify the call by generating this new path in a helper
> function.
>
> Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
>  merge-recursive.c | 53 ++++++++++++++++++++++++-----------------------
>  1 file changed, 27 insertions(+), 26 deletions(-)

Thanks, both.

Let's advance these patches to 'next' soonish.