From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>
Cc: Kevin Shanahan <kmshanah@disenchant.net>, git@vger.kernel.org
Subject: Re: Problem with git-apply?
Date: Sat, 4 Nov 2006 08:27:19 -0800 (PST) [thread overview]
Message-ID: <Pine.LNX.4.64.0611040821290.25218@g5.osdl.org> (raw)
In-Reply-To: <7v8xir4k3w.fsf@assigned-by-dhcp.cox.net>
On Sat, 4 Nov 2006, Junio C Hamano wrote:
>
> The problem appears that GNU diff _never_ uses "--- /dev/null" or "+++
> /dev/null" to indicate creation or deletion of the file, but the
> "traditional patch parser" builtin-apply has assumed that is what the
> traditional diff output from day one. Where we got that idea is mystery
> to me (this is Linus's code), but I suspect it is what other SCMs did.
No, the original code used to trigger a "create" diff on
- source was /dev/null
OR
- source had zero patches.
It used to have code like
if (patch->is_new < 0) {
patch->is_new = !oldlines;
if (!oldlines)
patch->old_name = NULL;
}
if (patch->is_delete < 0) {
patch->is_delete = !newlines;
if (!newlines)
patch->new_name = NULL;
}
and I think the person who broke it was you ;)
According to git-pickaxe, the buggy commit is 4be60962.
You should know by now that I never have bugs.
next prev parent reply other threads:[~2006-11-04 16:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-04 7:23 Problem with git-apply? Kevin Shanahan
2006-11-04 7:30 ` Shawn Pearce
2006-11-04 8:07 ` Kevin Shanahan
2006-11-04 9:26 ` Jakub Narebski
2006-11-04 10:12 ` Kevin Shanahan
2006-11-04 9:49 ` Junio C Hamano
2006-11-04 10:00 ` Junio C Hamano
2006-11-04 10:15 ` Junio C Hamano
2006-11-04 10:49 ` Kevin Shanahan
2006-11-04 16:27 ` Linus Torvalds [this message]
2006-11-04 18:33 ` Junio C Hamano
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=Pine.LNX.4.64.0611040821290.25218@g5.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=kmshanah@disenchant.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 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).