git apply: git diff header lacks filename information for git diff --no-index patch

From: Imre Deak <imre.deak@gmail.com>
Date: Oct 2, 2008, 18:27 UTC
Message-ID: <500f3d130810021127j570bb540p901f6a73f58a6cb1@mail.gmail.com>

Hi,

I have the following problem:

$ echo -e '\x0' > a $ git diff --no-index --binary /dev/null a > patch $ rm a $ git apply patch fatal: git diff header lacks filename information (line 4) $ cat patch

diff --git a/dev/null b/a
new file mode 100644
index 0000000000000000000000000000000000000000..1f2a4f5ef3df7f7456d91c961da36fc58904f2f1
GIT binary patch
literal 2
JcmZSJ0ssIE01E&B

literal 0
HcmV?d00001

The same works for text based patches:

$ echo 1 > a
$ git diff --no-index /dev/null a > patch
$ rm a
$ git apply patch
$ ls
a
$ cat patch
diff --git a/dev/null b/a
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/a
@@ -0,0 +1 @@
+1

The binary patch lacks ---/+++ lines but still provides the name info
on the diff --git line which I think should suffice for git apply.

--Imre