mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Linus Torvalds <torvalds@osdl.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: LKML <linux-kernel@vger.kernel.org>, Deepak Saxena <dsaxena@plexity.net>
Subject: Re: Strange commit?
Date: Fri, 30 Sep 2005 23:20:43 -0700 (PDT)	[thread overview]
Message-ID: <Pine.LNX.4.64.0509302255390.3378@g5.osdl.org> (raw)
In-Reply-To: <20051001141548.6f26f4e5.sfr@canb.auug.org.au>



On Sat, 1 Oct 2005, Stephen Rothwell wrote:
> 
> The first commit after v2.6.14-rc3 in your git tree seem to refer to the same tree object
> ast the v2.6.14-rc3 commit does.  Is this expected?

Drat. No. It is missing the actual diff ;)

The cause is that the patch was corrupted, but in a way that git-apply 
didn't notice. The diff looked like this:

	diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
	--- a/arch/arm/mach-ixp2000/core.c
	+++ b/arch/arm/mach-ixp2000/core.c
	 static struct resource ixp2000_uart_resource = {
	...

and it's actually missing the line numbers (and an empty line). Which ends 
up meaning that it's interpreted as an empty patch with just garbage 
following, so I ended up committing an empty change.

I've pushed out the real patch.

Thanks for noticing. I'll make "git-apply" flag empty patches as errors.

		Linus

      reply	other threads:[~2005-10-01  6:20 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-10-01  4:15 Stephen Rothwell
2005-10-01  6:20 ` Linus Torvalds [this message]

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.0509302255390.3378@g5.osdl.org \
    --to=torvalds@osdl.org \
    --cc=dsaxena@plexity.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /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

all inboxes | Powered by JetHome®