From: Jeff King <peff@peff.net>
To: Jakub Narebski <jnareb@gmail.com>
Cc: Imre Deak <imre.deak@gmail.com>, git@vger.kernel.org
Subject: Re: git apply: git diff header lacks filename information for git diff --no-index patch
Date: Sun, 5 Oct 2008 15:19:03 -0400 [thread overview]
Message-ID: <20081005191903.GA13980@coredump.intra.peff.net> (raw)
In-Reply-To: <gc79f4$22m$1@ger.gmane.org>
[argh, resending with the list cc'd]
On Sat, Oct 04, 2008 at 10:28:19AM +0200, Jakub Narebski wrote:
> > 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
next prev parent reply other threads:[~2008-10-05 19:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-02 18:27 git apply: git diff header lacks filename information for git diff --no-index patch Imre Deak
2008-10-04 4:17 ` Jeff King
2008-10-04 8:28 ` Jakub Narebski
2008-10-05 19:19 ` Jeff King [this message]
2008-10-04 16:54 ` Linus Torvalds
2008-10-04 17:08 ` Linus Torvalds
2008-10-04 17:48 ` Linus Torvalds
2008-10-05 19:21 ` Jeff King
2008-10-05 19:17 ` Jeff King
2008-10-05 19:24 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081005191903.GA13980@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=imre.deak@gmail.com \
--cc=jnareb@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).