git-apply fails to apply some patches

Hi, please see http://bugs.debian.org/386495 or below.  I can reproduce
the problem with 1.4.2.1.

Thanks, Gerrit.

----- Forwarded message from Matthew Wilcox [off-list ref] -----

Trying to apply a patch that was created with interdiff fails ...
Here's the first patch (which works)

--- pciutils-2.1.11.orig/debian/dirs
+++ pciutils-2.1.11/debian/dirs

@@ -0,0 +1,6 @@
+usr/share/misc
+usr/share/man
+usr/bin
+usr/lib
+usr/share/lintian/overrides
+bin

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/pciutils

and 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".


----- End forwarded message -----