From: Elijah Newren Date: Sat, 26 Feb 2011 18:34:55 GMT Subject: [RFC PATCH 0/2] Fix unnecessary updates of files during merge Message-ID: <1298745297-25713-1-git-send-email-newren@gmail.com> 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