lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Mon, 3 Mar 2008 10:40:15 +1300
From:	"Martin Langhoff" <martin.langhoff@...il.com>
To:	"Linus Torvalds" <torvalds@...ux-foundation.org>
Cc:	"Steve French" <smfrench@...il.com>,
	lkml <linux-kernel@...r.kernel.org>, git@...r.kernel.org
Subject: Re: kernel.org git tree corrupt?

On Mon, Mar 3, 2008 at 10:16 AM, Linus Torvalds
<torvalds@...ux-foundation.org> 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

hth,


martin
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ