From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 2/2] merge-recursive: Fix multiple file rename across D/F conflict
Date: Wed, 18 Aug 2010 12:00:13 -0700 [thread overview]
Message-ID: <7vaaojagqq.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1282089199-17253-3-git-send-email-newren@gmail.com> (Elijah Newren's message of "Tue\, 17 Aug 2010 17\:53\:19 -0600")
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.
next prev parent reply other threads:[~2010-08-18 19:00 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-17 23:53 [PATCH 0/2] Fix multiple file rename across D/F conflict Elijah Newren
2010-08-17 23:53 ` [PATCH 1/2] t6031: Add a testcase covering multiple renames across a " Elijah Newren
2010-08-17 23:53 ` [PATCH 2/2] merge-recursive: Fix multiple file rename across " Elijah Newren
2010-08-18 19:00 ` Junio C Hamano [this message]
2010-08-18 23:17 ` Junio C Hamano
2010-08-20 12:47 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vaaojagqq.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=newren@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).