From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Aug 2010 19:00:13 GMT
Subject: Re: [PATCH 2/2] merge-recursive: Fix multiple file rename across D/F conflict
Message-ID: <7vaaojagqq.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1282089199-17253-3-git-send-email-newren@gmail.com>

Elijah Newren <newren@gmail.com> writes:

> In 5a2580d (merge_recursive: Fix renames across paths below D/F conflicts
> 2010-07-09), detection was added for renames across paths involved in a
> directory<->file conflict.  However, the change accidentally involved
> reusing an outer loop index ('i') in an inner loop, changing its values
> and causing a slightly different type of breakage for cases where there are
> multiple renames across the D/F conflict.  Fix by creating a new temporary
> variable 'i'.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
> I'm really embarrased about this one...  :-/

I am too ;-)  Thanks for a fix.