From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Elijah Newren <newren@gmail.com>
Subject: [PATCH 0/2] Fix multiple file rename across D/F conflict
Date: Tue, 17 Aug 2010 17:53:17 -0600 [thread overview]
Message-ID: <1282089199-17253-1-git-send-email-newren@gmail.com> (raw)
Another D/F conflict not fixed by the en/d-f-conflict-fix series in next
was found in the wild, involving multiple file renames across a D/F
conflict. That series would have fixed this case too, were it not for
a stupid simple bug. Fix it, and add a testcase for good measure.
This series is on top of next; it needs both the en/d-f-conflict-fix
series and the testcase requires em/checkout-orphan.
Elijah Newren (2):
t6031: Add a testcase covering multiple renames across a D/F conflict
merge-recursive: Fix triple file rename across D/F conflict
merge-recursive.c | 1 +
t/t6031-merge-recursive.sh | 28 ++++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 0 deletions(-)
--
1.7.2.1.227.g086c8
next reply other threads:[~2010-08-17 23:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-17 23:53 Elijah Newren [this message]
2010-08-17 23:53 ` [PATCH 1/2] t6031: Add a testcase covering multiple renames across a D/F conflict 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
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=1282089199-17253-1-git-send-email-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).