GIT: net-*2.6 rebased...

GIT: net-*2.6 rebased...

[David Miller]

Both net-2.6 and net-next-2.6 have been rebased.

To be honest, if you've been pulling from my tree you can just keep
doing so if you want, it will look just as if I had merged Linus's
tree into net-2.6 et al.

All work will go into net-2.6 for the time being, this means only
bug fixes and such.

Once -rc1 goes out, changes can start flowing into net-next-2.6
once more.

Please adhere to these rules, it helps keep the tree stable and
preserve the limited sanity still remaining in folks like Stephen
Rothwell. :-)

Thanks.

Re: GIT: net-*2.6 rebased...

[Stephen Rothwell]

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

Hi Dave,

On Wed, 04 Aug 2010 16:21:41 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
>
> Please adhere to these rules, it helps keep the tree stable and
> preserve the limited sanity still remaining in folks like Stephen
> Rothwell. :-)

Now I am not sure if I should be insulted :-)

/me locks up all his sharp objects
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: GIT: net-*2.6 rebased...

[Arnd Hannemann]

Hi,

Am 05.08.2010 01:21, schrieb David Miller:
> 
> Both net-2.6 and net-next-2.6 have been rebased.
> 
> To be honest, if you've been pulling from my tree you can just keep
> doing so if you want, it will look just as if I had merged Linus's
> tree into net-2.6 et al.

I there something broken with the trees on git.kernel.org?

if I try to fetch from net-next-2.6, I get:
fatal: The remote end hung up unexpectedly

if I try to clone net-2.6:
(e.g. git clone git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git

I get lots of errors reading the tags "does not point to a valid object!" and then:
remote: error: Could not read 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4
remote: fatal: Failed to traverse parents of commit 7aaaaa1e44b2a4047dfe05f304a5090eb995cf44
remote: aborting due to possible repository corruption on the remote side.
fatal: early EOF
fatal: index-pack failed

I'm using git version 1.7.1.

Best regards,
 Arnd

Re: GIT: net-*2.6 rebased...

[Changli Gao]

On Thu, Aug 5, 2010 at 3:57 PM, Arnd Hannemann <arnd@arndnet.de> wrote:
> Hi,
>
> Am 05.08.2010 01:21, schrieb David Miller:
>>
>> Both net-2.6 and net-next-2.6 have been rebased.
>>
>> To be honest, if you've been pulling from my tree you can just keep
>> doing so if you want, it will look just as if I had merged Linus's
>> tree into net-2.6 et al.
>
> I there something broken with the trees on git.kernel.org?
>
> if I try to fetch from net-next-2.6, I get:
> fatal: The remote end hung up unexpectedly
>
> if I try to clone net-2.6:
> (e.g. git clone git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
>
> I get lots of errors reading the tags "does not point to a valid object!" and then:
> remote: error: Could not read 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4
> remote: fatal: Failed to traverse parents of commit 7aaaaa1e44b2a4047dfe05f304a5090eb995cf44
> remote: aborting due to possible repository corruption on the remote side.
> fatal: early EOF
> fatal: index-pack failed
>
> I'm using git version 1.7.1.
>

me 2 for net-next-2.6

localhost linux # git pull
fatal: The remote end hung up unexpectedly
localhost linux # git version
git version 1.7.1


-- 
Regards,
Changli Gao(xiaosuo@gmail.com)

Re: GIT: net-*2.6 rebased...

[David Miller]

From: Arnd Hannemann <arnd@arndnet.de>
Date: Thu, 05 Aug 2010 09:57:50 +0200

> if I try to fetch from net-next-2.6, I get:
> fatal: The remote end hung up unexpectedly
> 
> if I try to clone net-2.6:
> (e.g. git clone git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
> 
> I get lots of errors reading the tags "does not point to a valid object!" and then:
> remote: error: Could not read 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4
> remote: fatal: Failed to traverse parents of commit 7aaaaa1e44b2a4047dfe05f304a5090eb995cf44
> remote: aborting due to possible repository corruption on the remote side.
> fatal: early EOF
> fatal: index-pack failed

Hmmm, since I can I tried an ssh based clone and it works.

But indeed if I try to use the git:// URL it fails.

Oh I see, the alternates files in those repos are completely broken.
They have:

	/home/davem/git/../torvalds/linux-2.6.git/objects

/home/davem/git is a symlink to /pub/scm/linux/kernel/git/davem
so if I login and "cd git" then:

	git clone --shared --bare ../torvalds/linux-2.6.git net-next-2.6.git

which is how I always create my trees, we get that unusable 'alternates'
path above.

The ".." works when my GIT directory is the working directory, but
not as part of the symlink include path to get there.

I fixed the alternates file but it will take some time for the fix
to propagate from master.kernel.org

Let me know if it doesn't work even after an hour or so.

Thanks.

Re: GIT: net-*2.6 rebased...

[Arnd Hannemann]

Am 05.08.2010 10:46, schrieb David Miller:
> From: Arnd Hannemann <arnd@arndnet.de> Date: Thu, 05 Aug 2010
> 09:57:50 +0200
>
>> if I try to fetch from net-next-2.6, I get: fatal: The remote end
>> hung up unexpectedly
>>
>> if I try to clone net-2.6: (e.g. git clone
>> git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
>>
>> I get lots of errors reading the tags "does not point to a valid
>> object!" and then: remote: error: Could not read
>> 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 remote: fatal: Failed to
>> traverse parents of commit
>> 7aaaaa1e44b2a4047dfe05f304a5090eb995cf44 remote: aborting due to
>> possible repository corruption on the remote side. fatal: early
>> EOF fatal: index-pack failed
>
> I fixed the alternates file but it will take some time for the fix to
> propagate from master.kernel.org
>
> Let me know if it doesn't work even after an hour or so.

It works now, for both net-next-2.6 and net-2.6.

Thanks,
Arnd