mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andrew Morton <akpm@osdl.org>
To: Stelian Pop <stelian@popies.net>
Cc: mroos@linux.ee, linux-kernel@vger.kernel.org
Subject: Re: GIT tree broken?
Date: Fri, 8 Jul 2005 03:18:57 -0700	[thread overview]
Message-ID: <20050708031857.5b1d5950.akpm@osdl.org> (raw)
In-Reply-To: <1120816858.4688.4.camel@localhost.localdomain>

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.

  reply	other threads:[~2005-07-08 10:19 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-07-08  9:30 Meelis Roos
2005-07-08 10:00 ` Stelian Pop
2005-07-08 10:18   ` Andrew Morton [this message]
2005-07-08 10:27     ` Stelian Pop
2005-07-08 11:28   ` GIT tree broken? (rsync depreciated) Ed Tomlinson
2005-07-08 12:20     ` Stelian Pop
2005-07-14 11:55       ` Christian Kujau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050708031857.5b1d5950.akpm@osdl.org \
    --to=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mroos@linux.ee \
    --cc=stelian@popies.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®