Thread (10 messages) flat view 10 messages, 4 authors, 2016-06-15

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

From: Jeff King <hidden>
Date: 2016-06-15 22:45:26

[argh, resending with the list cc'd]

On Sat, Oct 04, 2008 at 10:28:19AM +0200, Jakub Narebski wrote:
quoted
Hmm. The problem is that "git apply" doesn't accept that "a/dev/null"
and "b/a" are the same, so it rejects them as a name. I
Shouldn't it be "/dev/null", not "a/dev/null"?  
Yes, see my recent reply to Linus elsewhere in the thread for why I
didn't think it was an issue at the time (but it clearly is).
Besides git-diff(1) states:

  1. It is preceded with a "git diff" header, that looks like
     this:

       diff --git a/file1 b/file2

     The `a/` and `b/` filenames are the same unless rename/copy is
     involved.  Especially, even for a creation or a deletion,
     `/dev/null` is _not_ used in place of `a/` or `b/` filenames.
And I hadn't seen this, which makes it utterly clear that the diff is
broken. Thanks for pointing it out.

-Peff
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help