From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 18 Oct 2006 13:53:23 GMT
Subject: Re: [BUG] git-log shows first parent and repeated last for octopus merge
Message-ID: <Pine.LNX.4.63.0610181551150.14200@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <eh5242$rar$1@sea.gmane.org>

Hi,

On Wed, 18 Oct 2006, Jakub Narebski wrote:

> When trying to find how many merges and how many octopus merges (merges with
> more than two parents) are in git.git repository I have encountered the
> following strange output of git-log:
> 
>  1000:jnareb@roke:~/git> git log --parents --full-history --max-count=1 \
>    211232bae64bcc60bbf5d1b5e5b2344c22ed767e -- a//b
>  commit 211232bae64bcc60bbf5d1b5e5b2344c22ed767e <last parent repeated>
>  Merge: d0d0d0b... d0d0d0b... d0d0d0b... d0d0d0b... d0d0d0b...
>  [...]

This happens because a//b rewrites the history, i.e. the parents are 
edited. IMHO it makes no sense at all to show the parents in such a case, 
since they are bogus.

Ciao,
Dscho