linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* GIT: net-*2.6 rebased...
@ 2010-08-04 23:21 David Miller
  2010-08-05  4:11 ` Stephen Rothwell
  2010-08-05  7:57 ` Arnd Hannemann
  0 siblings, 2 replies; 6+ messages in thread
From: David Miller @ 2010-08-04 23:21 UTC (permalink / raw)
  To: netdev; +Cc: linux-wireless, sfr


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.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: GIT: net-*2.6 rebased...
  2010-08-04 23:21 GIT: net-*2.6 rebased David Miller
@ 2010-08-05  4:11 ` Stephen Rothwell
  2010-08-05  7:57 ` Arnd Hannemann
  1 sibling, 0 replies; 6+ messages in thread
From: Stephen Rothwell @ 2010-08-05  4:11 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-wireless

[-- 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 --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: GIT: net-*2.6 rebased...
  2010-08-04 23:21 GIT: net-*2.6 rebased David Miller
  2010-08-05  4:11 ` Stephen Rothwell
@ 2010-08-05  7:57 ` Arnd Hannemann
  2010-08-05  8:02   ` Changli Gao
  2010-08-05  8:46   ` David Miller
  1 sibling, 2 replies; 6+ messages in thread
From: Arnd Hannemann @ 2010-08-05  7:57 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-wireless, sfr

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: GIT: net-*2.6 rebased...
  2010-08-05  7:57 ` Arnd Hannemann
@ 2010-08-05  8:02   ` Changli Gao
  2010-08-05  8:46   ` David Miller
  1 sibling, 0 replies; 6+ messages in thread
From: Changli Gao @ 2010-08-05  8:02 UTC (permalink / raw)
  To: Arnd Hannemann; +Cc: David Miller, netdev, linux-wireless, sfr

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)

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: GIT: net-*2.6 rebased...
  2010-08-05  7:57 ` Arnd Hannemann
  2010-08-05  8:02   ` Changli Gao
@ 2010-08-05  8:46   ` David Miller
  2010-08-05 14:45     ` Arnd Hannemann
  1 sibling, 1 reply; 6+ messages in thread
From: David Miller @ 2010-08-05  8:46 UTC (permalink / raw)
  To: arnd; +Cc: netdev, linux-wireless, sfr

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.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: GIT: net-*2.6 rebased...
  2010-08-05  8:46   ` David Miller
@ 2010-08-05 14:45     ` Arnd Hannemann
  0 siblings, 0 replies; 6+ messages in thread
From: Arnd Hannemann @ 2010-08-05 14:45 UTC (permalink / raw)
  To: David Miller; +Cc: netdev, linux-wireless, sfr

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


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-08-05 14:45 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-04 23:21 GIT: net-*2.6 rebased David Miller
2010-08-05  4:11 ` Stephen Rothwell
2010-08-05  7:57 ` Arnd Hannemann
2010-08-05  8:02   ` Changli Gao
2010-08-05  8:46   ` David Miller
2010-08-05 14:45     ` Arnd Hannemann

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).