Re: [RFC PATCH 0/2] Fix unnecessary updates of files during merge
Hi,
On Sat, Feb 26, 2011 at 11:34 AM, Elijah Newren <newren@gmail.com> wrote:
Show 8 quoted lines
> 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.
And, of course, I forgot to include the cc's in my send-email command.
Sorry about that, Stephen and Jeff. Adding you on this email, at
least.
Show 9 quoted lines
> 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(-)
Elijah Newren <newren@gmail.com>