All of lore.kernel.org
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@linux-foundation.org>
To: Jeff King <peff@peff.net>
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: Sat, 4 Oct 2008 10:08:58 -0700 (PDT)	[thread overview]
Message-ID: <alpine.LFD.2.00.0810041004290.3208@nehalem.linux-foundation.org> (raw)
In-Reply-To: <alpine.LFD.2.00.0810040918290.3208@nehalem.linux-foundation.org>



On Sat, 4 Oct 2008, Linus Torvalds wrote:
> 
> Anyway, for now I'd suggest a patch like this. Hmm? The "diff --git" 
> format assumes that the names are the same, so make it so.

Ahh, never mind, this one is broken. It's not _horribly_ so, but I 
shouldhave checked the test breakage. It changes non-broken cases from

	diff --git a/file b/file

into

	diff --git a/file a/file

so the header thing would need to be done differently. Don't even bother 
with that broken patch. I'll think about doing it better.

		Linus

  reply	other threads:[~2008-10-04 17:10 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
2008-10-04 16:54   ` Linus Torvalds
2008-10-04 17:08     ` Linus Torvalds [this message]
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=alpine.LFD.2.00.0810041004290.3208@nehalem.linux-foundation.org \
    --to=torvalds@linux-foundation.org \
    --cc=git@vger.kernel.org \
    --cc=imre.deak@gmail.com \
    --cc=peff@peff.net \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.