Thread (15 messages) flat view 15 messages, 7 authors, 2016-06-15

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

From: Mike Ralphson <hidden>
Date: 2016-06-15 22:44:46

2008/6/13 Don Zickus [off-list ref]:
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...

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.
Excellent spot. A couple of things you might want to add to your new
test cases would be examples where the first patch renames or removes
a file (or two files are swapped) and a subsequent patch then touches
the same path(s).

Mike
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help