Re: [PATCH 2/3] merge-recursive: Small code cleanup

From: Elijah Newren <newren@gmail.com>
Date: Sep 6, 2010, 21:25 UTC
Message-ID: <AANLkTiky3JL6rpo2x79dqQKKndUMa58Se_4CLpSFdj4+@mail.gmail.com>
In-Reply-To: <1283806070-22027-3-git-send-email-newren@gmail.com>

On Mon, Sep 6, 2010 at 2:47 PM, Elijah Newren <newren@gmail.com> wrote:

Show 15 quoted lines

> process_renames() had a variable named "stage" and derived variables
> src_other and dst_other whose purpose was not entirely clear to me.  Make
> the name of stage slightly more descriptive and add a brief comment
> explaining what is occurring.
>
> Also, in d5af510 (RE: [PATCH] Avoid rename/add conflict when contents are
> identical 2010-09-01), a separate if-block was added to provide a special
> case for the rename/add conflict case that can be resolved (namely when
> the contents on the destination side are identical).  However, as a
> separate if block, it's not immediately obvious that its code is related to
> the subsequent code checking for a rename/add conflict.  We can combine and
> simplify the check slightly.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---

Hmmm...should I have split this off from the rest of the series (its only relation is that it cleans up code that made it harder for me to find the real fix)? If I did that, I could rebase the rest of the series on maint...