Re: git-apply fails to apply some patches
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:40
Gerrit Pape [off-list ref] writes:
quoted hunk
... On top of that, I try to apply this interdiff generated patch: diff -u pciutils-2.1.11/debian/dirs pciutils-2.1.11/debian/dirs--- pciutils-2.1.11/debian/dirs +++ pciutils-2.1.11/debian/dirs@@ -6,0 +7 @@ +var/lib/pciutilsand git-apply says: error: debian/dirs: already exists in working directory I suspect it's confused by the '-x,0' thinking that means "file does not exist" rather than "we have 0 context for this diff".
There are a few safety checks we perform assuming that the patch has a few lines of context, and this is falsely triggering one of them. It incorrectly thinks that seeing _no_ context nor old lines in the patch means this is a file creation patch, and complains because it knows the file being patched already exists. I am looking into a way to handle a context-less patch line the one quoted, without breaking the sanity check we have. In the meantime you should be able to work things around by not feeding --unified=0 diff output.