git://oss.sgi.com broke

git://oss.sgi.com broke

[Andrew Morton]

y:/usr/src/git26> git --version
git version 1.5.6.rc0

y:/usr/src/git26> cat .git/branches/git-xfs
git://oss.sgi.com:8090/xfs/xfs-2.6.git#master

y:/usr/src/git26> git-fetch git-xfs        
remote: usage: git-pack-objects [{ -q | --progress | --all-progress }] 
remote:         [--max-pack-size=N] [--local] [--incremental] 
remote:         [--window=N] [-remote: -window-memory=N] [--depth=N] 
remote:         [--no-reuse-delta] [--no-reuse-object] [--delta-base-offset] 
remote:         [--threads=N] [--non-empty] [--reremote: vs [--unpacked | --all]*] [--reflog] 
remote:         [--stdout | base-name] [--keep-unreachable] [<ref-list | <object-list]
remote: aborting due to possible repository corruption on the remote side.
fatal: protocol error: bad pack header

It was OK yesterday.

(cc'ing the git list in case this is an faq?)

The last two error messages there look wrong/misleading?

Re: [xfs-masters] git://oss.sgi.com broke

[Christoph Hellwig]

On Fri, Oct 03, 2008 at 12:19:03PM -0700, Andrew Morton wrote:
> It was OK yesterday.
> 
> (cc'ing the git list in case this is an faq?)
> 
> The last two error messages there look wrong/misleading?

Git pull still works fine for me..

Re: [xfs-masters] git://oss.sgi.com broke

[Russell Cattelan]

Andrew Morton wrote:
> y:/usr/src/git26> git --version
> git version 1.5.6.rc0
>
> y:/usr/src/git26> cat .git/branches/git-xfs
> git://oss.sgi.com:8090/xfs/xfs-2.6.git#master
>
> y:/usr/src/git26> git-fetch git-xfs        
> remote: usage: git-pack-objects [{ -q | --progress | --all-progress }] 
> remote:         [--max-pack-size=N] [--local] [--incremental] 
> remote:         [--window=N] [-remote: -window-memory=N] [--depth=N] 
> remote:         [--no-reuse-delta] [--no-reuse-object] [--delta-base-offset] 
> remote:         [--threads=N] [--non-empty] [--reremote: vs [--unpacked | --all]*] [--reflog] 
> remote:         [--stdout | base-name] [--keep-unreachable] [<ref-list | <object-list]
> remote: aborting due to possible repository corruption on the remote side.
> fatal: protocol error: bad pack header
>
> It was OK yesterday.
>   

Hmm sees to work for me.
oss is running a newer version of git 1.6.0.2,  I wonder if there some 
version incomparability happening?
I'm using 1.5.6.4 on my remote client and it did a clone just fine.
Ahh but indeed a fetch failed ...
But it also fails with using v1.5.6.5 of git-daemon ...

So I don't know what is going on.

I'll keep digging into it.

Ohh and BTW we finally got the firewall set up to allow native git traffic
so you can drop port 8090 from the url.





> (cc'ing the git list in case this is an faq?)
>
> The last two error messages there look wrong/misleading?
>
>   

Re: [xfs-masters] git://oss.sgi.com broke

[Samuel Tardieu]

>>>>> "Russell" == Russell Cattelan <cattelan@thebarn.com> writes:

Russell> I'm using 1.5.6.4 on my remote client and it did a clone
Russell> just fine.  Ahh but indeed a fetch failed ...  But it also
Russell> fails with using v1.5.6.5 of git-daemon ...

I also have an error with "fetch" (while it works with "clone") on

  git://gcc.gnu.org/git/gcc.git

The error I get is from index-pack.c:get_index_from_pack():

% git fetch
remote: Generating pack...
remote: Done counting 6230 objects.
remote: Result has 3856 objects.
remote: Deltifying 3856 objects...
remote:  100% (3856/3856) done
remote: Total 3856 (delta 3234), reused 7 (delta 5)
Receiving objects: 100% (3856/3856), 6.99 MiB | 50 KiB/s, done.
fatal: premature end of pack file, 1858 bytes missing
fatal: index-pack failed

(the "premature end of pack file" message comes from a patch I
just submitted, before that it was a bogus error message due
to an improper use of errno)

I am using the latest spearce/next GIT, I don't know what version
runs on the FSF machine. Daniel, do you have this info?

  Sam
-- 
Samuel Tardieu -- sam@rfc1149.net -- http://www.rfc1149.net/

Re: [xfs-masters] git://oss.sgi.com broke

[Samuel Tardieu]

[resent, Daniel's address got mangled on my side]

>>>>> "Russell" == Russell Cattelan <cattelan@thebarn.com> writes:

Russell> I'm using 1.5.6.4 on my remote client and it did a clone
Russell> just fine.  Ahh but indeed a fetch failed ...  But it also
Russell> fails with using v1.5.6.5 of git-daemon ...

I also have an error with "fetch" (while it works with "clone") on

  git://gcc.gnu.org/git/gcc.git

The error I get is from index-pack.c:get_index_from_pack():

% git fetch
remote: Generating pack...
remote: Done counting 6230 objects.
remote: Result has 3856 objects.
remote: Deltifying 3856 objects...
remote:  100% (3856/3856) done
remote: Total 3856 (delta 3234), reused 7 (delta 5)
Receiving objects: 100% (3856/3856), 6.99 MiB | 50 KiB/s, done.
fatal: premature end of pack file, 1858 bytes missing
fatal: index-pack failed

(the "premature end of pack file" message comes from a patch I
just submitted, before that it was a bogus error message due
to an improper use of errno)

I am using the latest spearce/next GIT, I don't know what version
runs on the FSF machine. Daniel, do you have this info?

  Sam
-- 
Samuel Tardieu -- sam@rfc1149.net -- http://www.rfc1149.net/

Re: git://oss.sgi.com broke

[Linus Torvalds]

On Fri, 3 Oct 2008, Andrew Morton wrote:
>
> y:/usr/src/git26> git --version
> git version 1.5.6.rc0
> 
> y:/usr/src/git26> cat .git/branches/git-xfs
> git://oss.sgi.com:8090/xfs/xfs-2.6.git#master

Hmm. That's the really old and deprecated branch format.

I'm getting a "Connection refused" from oss.sgi.com, and I think there's 
possibly something broken there, but quite independently of that, maybe we 
can try to teach you another way to set up remote branches?

In your .git/config file, use

	[remote "git-xfs"]
		url = git://oss.sgi.com:8090/xfs/xfs-2.6.git
		fetch = master

because the whole .git/branches/<branch-name> thing is fairly deprecated, 
and cannot handle some things that the .git/config file format can (like 
saying where to fetch into, or how to push back etc).

		Linus

Re: git://oss.sgi.com broke

[Daniel Barkalow]

On Mon, 6 Oct 2008, Linus Torvalds wrote:

> On Fri, 3 Oct 2008, Andrew Morton wrote:
> >
> > y:/usr/src/git26> git --version
> > git version 1.5.6.rc0
> > 
> > y:/usr/src/git26> cat .git/branches/git-xfs
> > git://oss.sgi.com:8090/xfs/xfs-2.6.git#master
> 
> Hmm. That's the really old and deprecated branch format.
> 
> I'm getting a "Connection refused" from oss.sgi.com, and I think there's 
> possibly something broken there, but quite independently of that, maybe we 
> can try to teach you another way to set up remote branches?
> 
> In your .git/config file, use
> 
> 	[remote "git-xfs"]
> 		url = git://oss.sgi.com:8090/xfs/xfs-2.6.git
> 		fetch = master
> 
> because the whole .git/branches/<branch-name> thing is fairly deprecated, 
> and cannot handle some things that the .git/config file format can (like 
> saying where to fetch into, or how to push back etc).

I think Andrew convinced us to undeprecate that format, because he wants 
to be able to configure each branch with one line in a separate file. In 
any case, remote.c takes care of these things seemlessly.

	-Daniel
*This .sig left intentionally blank*

Re: git://oss.sgi.com broke

[Andrew Morton]

On Mon, 6 Oct 2008 13:58:02 -0400 (EDT) Daniel Barkalow <barkalow@iabervon.org> wrote:

> On Mon, 6 Oct 2008, Linus Torvalds wrote:
> 
> > On Fri, 3 Oct 2008, Andrew Morton wrote:
> > >
> > > y:/usr/src/git26> git --version
> > > git version 1.5.6.rc0
> > > 
> > > y:/usr/src/git26> cat .git/branches/git-xfs
> > > git://oss.sgi.com:8090/xfs/xfs-2.6.git#master
> > 
> > Hmm. That's the really old and deprecated branch format.
> > 
> > I'm getting a "Connection refused" from oss.sgi.com, and I think there's 
> > possibly something broken there, but quite independently of that, maybe we 
> > can try to teach you another way to set up remote branches?
> > 
> > In your .git/config file, use
> > 
> > 	[remote "git-xfs"]
> > 		url = git://oss.sgi.com:8090/xfs/xfs-2.6.git
> > 		fetch = master
> > 
> > because the whole .git/branches/<branch-name> thing is fairly deprecated, 
> > and cannot handle some things that the .git/config file format can (like 
> > saying where to fetch into, or how to push back etc).
> 
> I think Andrew convinced us to undeprecate that format, because he wants 
> to be able to configure each branch with one line in a separate file. In 
> any case, remote.c takes care of these things seemlessly.
> 

Well I was kinda attached to the old format but my world wouldn't end
if it went away.

Judging from the Next/Trees contents, I suspect that Stephen uses the old
convenient/compact/one-per-file form too.

Re: [xfs-masters] git://oss.sgi.com broke

[Russell Cattelan]

Andrew Morton wrote:
> y:/usr/src/git26> git --version
> git version 1.5.6.rc0
>
> y:/usr/src/git26> cat .git/branches/git-xfs
> git://oss.sgi.com:8090/xfs/xfs-2.6.git#master
>
> y:/usr/src/git26> git-fetch git-xfs        
> remote: usage: git-pack-objects [{ -q | --progress | --all-progress }] 
> remote:         [--max-pack-size=N] [--local] [--incremental] 
> remote:         [--window=N] [-remote: -window-memory=N] [--depth=N] 
> remote:         [--no-reuse-delta] [--no-reuse-object] [--delta-base-offset] 
> remote:         [--threads=N] [--non-empty] [--reremote: vs [--unpacked | --all]*] [--reflog] 
> remote:         [--stdout | base-name] [--keep-unreachable] [<ref-list | <object-list]
> remote: aborting due to possible repository corruption on the remote side.
> fatal: protocol error: bad pack header
>
> It was OK yesterday.
>
> (cc'ing the git list in case this is an faq?)
>
> The last two error messages there look wrong/misleading?
>
>   
Ok not sure exactly what was wrong but it looks like there was some 
confusion
with older git bits still install on oss.

I manually cleaned everything from the system and reinstalled git from a 
fresh "make rpm" rpm.

Please try your pull again and see if the problem is resolved.

-Russell

Re: [xfs-masters] git://oss.sgi.com broke

[Andrew Morton]

On Mon, 06 Oct 2008 12:30:10 -0500 Russell Cattelan <cattelan@thebarn.com> wrote:

> Andrew Morton wrote:
> > y:/usr/src/git26> git --version
> > git version 1.5.6.rc0
> >
> > y:/usr/src/git26> cat .git/branches/git-xfs
> > git://oss.sgi.com:8090/xfs/xfs-2.6.git#master
> >
> > y:/usr/src/git26> git-fetch git-xfs        
> > remote: usage: git-pack-objects [{ -q | --progress | --all-progress }] 
> > remote:         [--max-pack-size=N] [--local] [--incremental] 
> > remote:         [--window=N] [-remote: -window-memory=N] [--depth=N] 
> > remote:         [--no-reuse-delta] [--no-reuse-object] [--delta-base-offset] 
> > remote:         [--threads=N] [--non-empty] [--reremote: vs [--unpacked | --all]*] [--reflog] 
> > remote:         [--stdout | base-name] [--keep-unreachable] [<ref-list | <object-list]
> > remote: aborting due to possible repository corruption on the remote side.
> > fatal: protocol error: bad pack header
> >
> > It was OK yesterday.
> >
> > (cc'ing the git list in case this is an faq?)
> >
> > The last two error messages there look wrong/misleading?
> >
> >   
> Ok not sure exactly what was wrong but it looks like there was some 
> confusion
> with older git bits still install on oss.
> 
> I manually cleaned everything from the system and reinstalled git from a 
> fresh "make rpm" rpm.
> 
> Please try your pull again and see if the problem is resolved.
> 

It seems OK now, thanks.