When the --check option was used with multiple patch files which
modify the same files, the patch can fail because the previously
modified contents aren't written to the disk.
So save the in memory patch contents across the processing of multiple
patch files. Added a new test case for --check wit
Allow the user to allow a patch which has some hunks (fragments)
already applied to succeed. Added test case and documentation.
Signed-off-by: Robert Fitzsimons <[EMAIL PROTECTED]>
---
Documentation/git-apply.txt |7 ++-
apply.c | 12 +
t/t4108-apply-ignor
A patch file (or stdin) which modifies the same file more then once
will fail to apply the patch correctly. In the worst case it will
apply some of the patch and leave an invalid output file(s).
apply.c has been changed to search for previously processed files and
use the in memory copy of the da
3 matches
Mail list logo