Messages in this thread |  | | | Date | Fri, 30 Sep 2005 23:20:43 -0700 (PDT) | | From | Linus Torvalds <> | | Subject | Re: Strange commit? |
| |
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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|  |