Re: My git repo is broken, how to fix it ?

From: Johannes Sixt <J.Sixt@eudaptics.com>
To: git@vger.kernel.org
Subject: Re: My git repo is broken, how to fix it ?
Date: Thu, 22 Mar 2007 18:12:55 +0100	[thread overview]
Message-ID: <4602B917.5C2912F4@eudaptics.com> (raw)
In-Reply-To: Pine.LNX.4.64.0703220924590.6730@woody.linux-foundation.org

[-- Attachment #1: Type: text/plain, Size: 760 bytes --]

Linus Torvalds wrote:
> Yeehaa! I think I'm on the right trail.
> 
> Git people: do this:
> 
>         yum install ElectricFence
> 
> (or similar, apt-get, whatever), and then apply this patch, and do
> 
>         make test
> 
> and it will fail in "git-apply"! Which (having read Alexander's corruption
> sequence once more) must have been what corrupted things for Alexander
> too!

Here is a repo, created with the MinGW port. It has a corrupted object,
that you can see even on Linux with just

$ git show :one

It was created with an obviously bogus "git apply" on Windows.
To restore the correct object, just do this on Linux:

$ git read-tree --reset -u HEAD
$ git apply --index patch.file

Now "git show :one" gives you the correct one.

HTH,
-- Hannes

[-- Attachment #2: trash.tgz --]
[-- Type: application/x-compressed, Size: 8823 bytes --]