From: Teemu Likonen <tlikonen@iki.fi>
Date: Wed, 04 Jun 2008 17:38:20 GMT
Subject: Re: log --graph --first-parent weirdness
Message-ID: <20080604173820.GA3038@mithlond.arda.local>
In-Reply-To: <7vmym1xgy4.fsf@gitster.siamese.dyndns.org>

Junio C Hamano wrote (2008-06-04 10:12 -0700):

> Teemu Likonen <tlikonen@iki.fi> writes:
> 
> > The output of "git log --graph --first-parent" seems weird.
> 
> Heh, --first-parent means "I'll view everything as a single strand of
> pearls".  Who in the right mind would use --graph at the same time to
> begin with ;-)?

Exactly :) I have an alias "lg = log --graph" and I almost always use
that instead of the normal log. Then I accidentally noticed that my "git
lg" doesn't quite fit with --first-parent.

> We could turn --graph automatically off if --first-parent is given,
> but I tend to agree with you that the right behaviour is to show the
> same "everything prefixed with '| ', wasting two columns without good
> reason" output as you would see on a true linear history.

To me it's perfectly fine to turn off --graph when used with
--first-parent, but yes, generally users might expect to see a line of
M's, *'s and |'s there. At least it would clearly show which commits are
merges and which are not.