Re: 'git commit' duplicates parents?

From: Linus Torvalds <torvalds@osdl.org>
Date: Jun 20, 2005, 15:11 UTC
Message-ID: <Pine.LNX.4.58.0506200808090.2268@ppc970.osdl.org>
In-Reply-To: <42B690EA.2080605@gmail.com>

On Mon, 20 Jun 2005, Dan Holmsand wrote:

Show 6 quoted lines

> 
> git-resolve-script still seems a bit too eager to write MERGE_HEAD and 
> ORIG_HEAD - they only make sense if there's actually been any merging 
> done, don't they?
> 
> Patch below shows what I mean.

I considered this, but decided that MERGE_HEAD is potentially very useful for some of the other failure exits. There's a few "exit 1"'s in there, for example when the "git-read-tree -m" fails because of a dirty workspace.

Of course, you can always re-do the merge completely (and maybe that's what people end up doing), but at least in theory you can fix it up and just re-resolve. But in order to do that, you need to know what the MERGE_HEAD was...

So I'm not sure what the right answer is, which is why my fix was the minimally invasive one that only removes the heads on success..

		Linus