Re: [RFC PATCH 0/2] Fix unnecessary updates of files during merge

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Sat, Feb 26, 2011 at 11:34 AM, Elijah Newren <newren@xxxxxxxxx> wrote:
> 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.

> 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(-)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]