From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: Elijah Newren <newren@gmail.com>
Subject: [RFC PATCH 0/2] Fix unnecessary updates of files during merge
Date: Sat, 26 Feb 2011 11:34:55 -0700 [thread overview]
Message-ID: <1298745297-25713-1-git-send-email-newren@gmail.com> (raw)
In-Reply-To: <20110224115233.GA31356@sigill.intra.peff.net>
This patch series adds a simple testcase demonstrating the problem
reported by Stephen Rothwell, and a fix. Unfortunately, there's a bug
with the fix (hence the RFC) that makes the relevant files racily clean
rather than clearly clean (i.e. 'git diff-files' will report these files
as modified when it shouldn't).
I'll try to figure out how to fix the second problem in the next few
days. If anyone has some hints, I'm all ears.
Elijah Newren (2):
t6022: New test checking for unnecessary updates of renamed+modified
files
merge-recursive: When we detect we can skip an update, actually skip
it
merge-recursive.c | 7 +++++--
t/t6022-merge-rename.sh | 32 ++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+), 2 deletions(-)
--
1.7.4.1.23.g4865dd
next prev parent reply other threads:[~2011-02-26 18:35 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-24 3:33 new behaviour in git merge Stephen Rothwell
2011-02-24 8:15 ` Jeff King
2011-02-24 9:24 ` Stephen Rothwell
2011-02-24 11:52 ` Jeff King
2011-02-26 18:34 ` Elijah Newren [this message]
2011-02-26 18:34 ` [RFC PATCH 1/2] t6022: New test checking for unnecessary updates of renamed+modified files Elijah Newren
2011-02-26 18:34 ` [RFC PATCH 2/2] merge-recursive: When we detect we can skip an update, actually skip it Elijah Newren
2011-02-26 18:43 ` [RFC PATCH 0/2] Fix unnecessary updates of files during merge 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1298745297-25713-1-git-send-email-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).