Re: [PATCH] cogito: Avoid slowness when timewarping large trees.

From: Jeff King <peff@peff.net>
Date: Mar 24, 2006, 11:22 UTC
Message-ID: <20060324112246.GA5220@coredump.intra.peff.net>
In-Reply-To: <7v3bh814z4.fsf@assigned-by-dhcp.cox.net>

On Fri, Mar 24, 2006 at 03:01:35AM -0800, Junio C Hamano wrote:

> >   git-read-tree --reset "$base"
> Exactly.  That's what I meant.  Thanks.

Hmm. That doesn't actually work, though. If I have a history like this:

$ cg-init -m "initial" $ cg-tag initial $ echo contents >file $ cg-add file $ cg-commit -m "added file"

and I try this: $ echo changes >file $ git-read-tree --reset master $ git-read-tree -m -u master initial

I get this: fatal: Entry 'file' not uptodate. Cannot merge.

If I do an update-index before the second read-tree, then I simply get: fatal: Entry 'file' would be overwritten by merge. Cannot merge.

Is there something I'm missing, or is a 'git reset --hard' really what we want here (in that case, the fact that git reset changes the HEAD might be a problem)?

-Peff