LKML Archive on
help / color / mirror / Atom feed
From: "Martin Langhoff" <>
To: "Linus Torvalds" <>
Cc: "Steve French" <>,
	lkml <>,
Subject: Re: git tree corrupt?
Date: Mon, 3 Mar 2008 10:40:15 +1300	[thread overview]
Message-ID: <> (raw)
In-Reply-To: <>

On Mon, Mar 3, 2008 at 10:16 AM, Linus Torvalds
<> wrote:
>  In that case, your "origin" simply isn't updated, but points somewhere
>  long back in history. I can only assume that cogito has done something
>  wrong, like not been able to handle packed refs or something, and you have
>  an updated tree but "origin" pointing to way back in the history.

Strange - cogito over git protocol will use git itself to peek at the
references. Steve, what is your git version?

>  > Ideas for another solution short of recloning and sorting through all
>  > of the last month or two of patches that affect this directory by
>  > hand?

Linus' plan assumes you have a .git/config file. I don't think a
cogito-based checkout follows such modern conventions - here's an
alternative plan:

 - make sure you have a current git

 - get a fresh clone of linux-2.6, and in there

    # tell it about your old checkout
    $ git remote add oldlinux /path/to/your/older/linux/checkout/.git
    $ git fetch oldlinux
    # visualise what's in there
    $ gitk origin/master oldlinux/master

    # you may want to merge your old branch
    $ git merge oldlinux/master



  reply	other threads:[~2008-03-02 21:40 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-02 15:49 Steve French
2008-03-02 21:16 ` Linus Torvalds
2008-03-02 21:40   ` Martin Langhoff [this message]
2008-03-02 22:02     ` Steve French
2008-03-03  3:43   ` Steve French
2008-03-03 16:21     ` Linus Torvalds
2008-03-04  4:42       ` Steve French

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:

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

  git send-email \ \ \ \ \ \ \
    --subject='Re: git tree corrupt?' \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

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