From: Johannes Schindelin Date: Mon, 31 Jul 2006 10:42:35 GMT Subject: Re: git merge (resolve) _is_ stupid Message-ID: In-Reply-To: <7v7j1u88ol.fsf@assigned-by-dhcp.cox.net> Hi, On Mon, 31 Jul 2006, Junio C Hamano wrote: > By the way, the "recur" strategy in "next" produces the correct > result, but it produces a funny error in the middle (that is why > Johannes is CC'ed). > > error: Could not read 0100000000000000000000000000000000000000 I get "0000000100..." ;-) (surprixse her wi1h a big-endian ;-) The culprit is the call to parse_commit() in merge_bases(). How about this? -- 8< -- [PATCH] merge-recur: virtual commits shall never be parsed It would not make sense to parse a virtual commit, therefore set the "parsed" flag to 1. Signed-off-by: Johannes Schindelin --- merge-recursive.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 10bce70..74a329f 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -43,6 +43,8 @@ static struct commit *make_virtual_commi commit->tree = tree; commit->util = (void*)comment; *(int*)commit->object.sha1 = virtual_id++; + /* avoid warnings */ + commit->object.parsed = 1; return commit; } -- 1.4.2.rc2.gfd00-dirty