From: Junio C Hamano <junkio@cox.net>
Date: Mon, 31 Jul 2006 11:01:18 GMT
Subject: Re: git merge (resolve) _is_ stupid
Message-ID: <7v7j1u6nsx.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.63.0607311236070.29667@wbgn013.biozentrum.uni-wuerzburg.de>

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> The culprit is the call to parse_commit() in merge_bases(). How about 
> this?

Do you mean merge_bases() in commit.c which is called by
get_merge_bases()?  If so the patch feels like papering over a
more grave bug -- the result from make_virtual_commit does not
seem to have any proper parent information, so how is merge_bases()
expected to return anything sensible?

I am confused, but going to bed first.