Re: git merging

From: Jens Axboe <axboe@suse.de>
Date: Jun 20, 2005, 12:30 UTC
Message-ID: <20050620123053.GI15021@suse.de>
In-Reply-To: <Pine.LNX.4.58.0506171700200.2268@ppc970.osdl.org>

On Fri, Jun 17 2005, Linus Torvalds wrote:

Show 11 quoted lines

> 
> 
> On Fri, 17 Jun 2005, Jeff Garzik wrote:
> > 
> > This is definitely not the case; my .git/HEAD is _always_ a symlink.
> 
> Ok. Are you sure that you gave the same arguments (or rather, lack of
> arguments) to both fsck and "git prune"? The thing is, they are both
> really the same thing, so I'm pretty surprised. If git prune says 
> something is unreachable, then git-fsck-cache shouldn't complain about it 
> being gone, because one just depends on the other..

Seeing something weird here as well, my setup is similar to Jeffs in that I have branches in refs/heads/* and HEAD a symlink to the active one.

I committed a bad patch, so wanting to reverse that change I did an

# echo sha_of_previous_commit > .git/HEAD # git-read-tree -m HEAD && git-checkout-cache -q -f -u -a

which, if I understand correctly, should put me back where I was before. So continuing commits, checking the tree now gives me:

axboe@nelson:[.]l/git/linux-2.6-block.git $ git prune error: cannot map sha1 file c39ae07f393806ccf406ef966e9a15afc43cc36a bad sha1 entry '5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c' axboe@nelson:[.]l/git/linux-2.6-block.git $ git-fsck-cache error: cannot map sha1 file c39ae07f393806ccf406ef966e9a15afc43cc36a bad object in tag 5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c bad sha1 entry '5dc01c595e6c6ec9ccda4f6f69c131c0dd945f8c'

Running git prune again gives me the same output. What is wrong?

-- 
Jens Axboe