GIT tree broken?

GIT tree broken?

[Meelis Roos]

I'm trying to sync with 
rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git 
with cogito cg-update (cogito 0.11.3+20050610-1 Debian package) and it 
fails with the following error:

Applying changes...
error: cannot map sha1 file 043d051615aa5da09a7e44f1edbb69798458e067
error: Could not read 043d051615aa5da09a7e44f1edbb69798458e067
cg-merge: unable to automatically determine merge base

-- 
Meelis Roos (mroos@linux.ee)

Re: GIT tree broken?

[Stelian Pop]

Le vendredi 08 juillet 2005 à 12:30 +0300, Meelis Roos a écrit :
> I'm trying to sync with 
> rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git 
> with cogito cg-update (cogito 0.11.3+20050610-1 Debian package) and it 
> fails with the following error:
> 
> Applying changes...
> error: cannot map sha1 file 043d051615aa5da09a7e44f1edbb69798458e067
> error: Could not read 043d051615aa5da09a7e44f1edbb69798458e067
> cg-merge: unable to automatically determine merge base

I see this too, with the latest cogito git tree, reproductible even in a
fresh environment:

$ rm -rf linux-2.6.git
$ cg-clone
http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
linux-2.6.git
defaulting to local storage area

11:57:48
URL:http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/refs/heads/master[41/41] -> "refs/heads/origin" [1] 
progress: 2 objects, 981 bytes
error: File 2a7e338ec2fc6aac461a11fe8049799e65639166
(http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/objects/2a/7e338ec2fc6aac461a11fe8049799e65639166) corrupt

Cannot obtain needed blob 2a7e338ec2fc6aac461a11fe8049799e65639166
while processing commit 0000000000000000000000000000000000000000.
cg-pull: objects pull failed
cg-init: pull failed

Stelian.
-- 
Stelian Pop <stelian@popies.net>

Re: GIT tree broken?

[Andrew Morton]

Stelian Pop <stelian@popies.net> wrote:
>
> Le vendredi 08 juillet 2005 à 12:30 +0300, Meelis Roos a écrit :
>  > I'm trying to sync with 
>  > rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git 
>  > with cogito cg-update (cogito 0.11.3+20050610-1 Debian package) and it 
>  > fails with the following error:

Upgrade to cogito-0.12.  

>  > Applying changes...
>  > error: cannot map sha1 file 043d051615aa5da09a7e44f1edbb69798458e067
>  > error: Could not read 043d051615aa5da09a7e44f1edbb69798458e067
>  > cg-merge: unable to automatically determine merge base
> 
>  I see this too, with the latest cogito git tree, reproductible even in a
>  fresh environment:

Maybe post-0.12 broke.  Try the 0.12 release.

Re: GIT tree broken?

[Stelian Pop]

Le vendredi 08 juillet 2005 à 03:18 -0700, Andrew Morton a écrit :

> Maybe post-0.12 broke.  Try the 0.12 release.

Did try that but it does not solve the problem:

deep-space-9:~/kernel/git 41 > cg-version
cogito-0.12
deep-space-9:~/kernel/git 42 > cg-clone
http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
linux-2.6.git
defaulting to local storage area
12:26:25
URL:http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/refs/heads/master [41/41] -> "refs/heads/origin" [1]
progress: 2 objects, 981 bytes
error: File 2a7e338ec2fc6aac461a11fe8049799e65639166
(http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/objects/2a/7e338ec2fc6aac461a11fe8049799e65639166) corrupt

Cannot obtain needed blob 2a7e338ec2fc6aac461a11fe8049799e65639166
while processing commit 0000000000000000000000000000000000000000.
cg-pull: objects pull failed
cg-init: pull failed


If I manually try to get
http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/objects/2a/7e338ec2fc6aac461a11fe8049799e65639166 I get a 404 in return.

Stelian.
-- 
Stelian Pop <stelian@popies.net>

Re: GIT tree broken? (rsync depreciated)

[Ed Tomlinson]

Hi,

I resync(ed) cg and rebuild this morning and it worked fine.  

On another tack.  Updating the kernel gave a message that rsync is depreciated and
will soon be turned off.  How should we be updating git/cg trees now?

Thanks
Ed Tomlinson

On Friday 08 July 2005 06:00, Stelian Pop wrote:
> Le vendredi 08 juillet 2005 à 12:30 +0300, Meelis Roos a écrit :
> > I'm trying to sync with 
> > rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git 
> > with cogito cg-update (cogito 0.11.3+20050610-1 Debian package) and it 
> > fails with the following error:
> > 
> > Applying changes...
> > error: cannot map sha1 file 043d051615aa5da09a7e44f1edbb69798458e067
> > error: Could not read 043d051615aa5da09a7e44f1edbb69798458e067
> > cg-merge: unable to automatically determine merge base
> 
> I see this too, with the latest cogito git tree, reproductible even in a
> fresh environment:
> 
> $ rm -rf linux-2.6.git
> $ cg-clone
> http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> linux-2.6.git
> defaulting to local storage area
> 
> 11:57:48
> URL:http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/refs/heads/master[41/41] -> "refs/heads/origin" [1] 
> progress: 2 objects, 981 bytes
> error: File 2a7e338ec2fc6aac461a11fe8049799e65639166
> (http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git/objects/2a/7e338ec2fc6aac461a11fe8049799e65639166) corrupt
> 
> Cannot obtain needed blob 2a7e338ec2fc6aac461a11fe8049799e65639166
> while processing commit 0000000000000000000000000000000000000000.
> cg-pull: objects pull failed
> cg-init: pull failed
> 
> Stelian.

Re: GIT tree broken? (rsync depreciated)

[Stelian Pop]

[sorry Ed for the duplicate...]

Le vendredi 08 juillet 2005 à 07:28 -0400, Ed Tomlinson a écrit :
> Hi,
> 
> I resync(ed) cg and rebuild this morning and it worked fine.  
> 
> On another tack.  Updating the kernel gave a message that rsync is
depreciated and
> will soon be turned off.  How should we be updating git/cg trees now?

After resyncing cogito to the latest version (which incorporates the
'pack' changes, which were causing the failure), it does indeed work
again, when using rsync.

However, it still fails when using http.

Stelian.
-- 
Stelian Pop <stelian@popies.net>

Re: GIT tree broken? (rsync depreciated)

[Christian Kujau]

Stelian Pop schrieb:
> After resyncing cogito to the latest version (which incorporates the
> 'pack' changes, which were causing the failure), it does indeed work
> again, when using rsync.
> 

hm, i haven't updated my git-tree (linux-2.6.git) for a while and i got
similiar error messages. i updated cogito to:

% cg-version
cogito-0.12.1 (cbec08d191d36126ddaf021961cc8995794b4a72)

and the "cannot map sha1 file..." errors went away. now i get:

Applying changes...
error: Could not read 043d051615aa5da09a7e44f1edbb69798458e067
error: Could not read 043d051615aa5da09a7e44f1edbb69798458e067
error: Could not read c101f3136cc98a003d0d16be6fab7d0d950581a6
error: Could not read c101f3136cc98a003d0d16be6fab7d0d950581a6
error: Could not read c101f3136cc98a003d0d16be6fab7d0d950581a6
error: Could not read a18bcb7450840f07a772a45229de4811d930f461
Merging 99f95e5286df2f69edab8a04c7080d986ee4233b ->
514fd7fd01d378a7b5584c657d9807fc28f22079
        to 62351cc38d3eaf3de0327054dd6ebc039f4da80d...
fatal: failed to unpack tree object bda3910b7737a4fac464792657ffedcba185d799
cg-merge: git-read-tree failed (merge likely blocked by local changes)

i *think* i did not make any local changes, but if i did - i want to get
rid ofthem and want a clean tree.

cg-status prints a lot of files with a "D" in front of it but "cg-status
-h" does not know about the "D" status flag....

any hints for this one?

thank you,
Christian.
-- 
BOFH excuse #378:

Operators killed by year 2000 bug bite.

Re: GIT tree broken? (rsync depreciated)

[walt]

Stelian Pop wrote:

> After resyncing cogito to the latest version (which incorporates the
> 'pack' changes, which were causing the failure), it does indeed work
> again, when using rsync.

I also found that using cogito-0.12 in my existing source directory
would not update properly.  After some fiddling I gave up and did
a fresh cg-clone which seems to be okay.