2008/6/13 Don Zickus <dzickus@xxxxxxxxxx>: > 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 -- 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