Re: [PATCH] git-apply doesn't handle same name patches well [V3]

From: Jakub Narebski <jnareb@gmail.com>
Date: Jun 16, 2008, 20:27 UTC
Message-ID: <m3prqhnn0b.fsf@localhost.localdomain>
In-Reply-To: <1213646686-31964-1-git-send-email-dzickus@redhat.com>

Don Zickus <dzickus@redhat.com> writes:

Show 15 quoted lines

> When working with a lot of people who backport patches all day long, every
> once in a while I get a patch that modifies the same file more than once
> inside the same patch.  git-apply either fails if the second change relies
> on the first change or silently drops the first change if the second change
> is independent.
> 
> The silent part is the scary scenario for us.  Also this behaviour is
> different from the patch-utils.
> 
> I have modified git-apply to cache the filenames of files it modifies such
> that if a later patch chunk modifies a file in the cache it will buffer the
> previously changed file instead of reading the original file from disk.
> 
> Logic has been put in to handle creations/deletions/renames/copies.  All the
> relevant tests of git-apply succeed.

Very nice, although most probably I would never use this.

+1

-- 
Jakub Narebski
Poland
ShadeHawk on #git