Strange commit?

Strange commit?

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

Hi Linus,

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?

i.e. commits 1c9426e8a59461688bb451e006456987b198e4c0 and
69d37960b578be0a69383bd71d06c1fcfb86e8b9 both refer to tree
1041e0ea3650a74d5b1fc730cd7b697d0eed5d01.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

Re: Strange commit?

[Linus Torvalds]

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