git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Teemu Likonen <tlikonen@iki.fi>
To: Junio C Hamano <gitster@pobox.com>
Cc: Adam Simpkins <adam@adamsimpkins.net>, git@vger.kernel.org
Subject: Re: log --graph --first-parent weirdness
Date: Thu, 5 Jun 2008 12:50:33 +0300	[thread overview]
Message-ID: <20080605095033.GC5946@mithlond.arda.local> (raw)
In-Reply-To: <7v1w3dxeh9.fsf@gitster.siamese.dyndns.org>

Junio C Hamano wrote (2008-06-04 11:05 -0700):

> Teemu Likonen <tlikonen@iki.fi> writes:
> 
> > 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.
> 
> I disagree.  If you are doing --first-parent, you do not _care_ what
> is merge and what is not.  Besides, you can easily see that from the
> log message if you cared enough.
> 
> And if the graph actually draws the real ancestry graph (i.e. without
> --first-parent), the lines visually show which is merge and which is
> not, so the "M" gets very distracting.
> 
> I'd really suggest changing the "M" and use "*" everywhere.

Well, I disagree :-) Merges are interesting points in history (they
introduce features etc.) and for a "--graph --first-parent" user
a certain already known merge is easier to find if there is a stable
identifier for them (like "M"). Commit messages are not stable in that
sense and it helps if user can just keep an eye on the graph when
searching for a certain merge (helps to skip other commits). Once the
correct merge is found, one would perhaps do "git log -p
<the-SHA1-of-that-merge>^2".

So I like having separate identifiers for merge commits. However, I do
realize that in the bigger picture those M's are not at all essential
for finding wanted information from project's history. So this question
is not something I'd go arguing too seriously.

  parent reply	other threads:[~2008-06-05 10:04 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-04 15:00 log --graph --first-parent weirdness Teemu Likonen
2008-06-04 15:08 ` Teemu Likonen
2008-06-04 17:12 ` Junio C Hamano
2008-06-04 17:38   ` Teemu Likonen
2008-06-04 18:04     ` Adam Simpkins
2008-06-05  8:56       ` [PATCH] graph API: fix "git log --graph --first-parent" Adam Simpkins
2008-06-04 18:05     ` log --graph --first-parent weirdness Junio C Hamano
2008-06-05  1:37       ` Ping Yin
2008-06-05  9:28       ` Adam Simpkins
2008-06-05  9:50       ` Teemu Likonen [this message]
2008-06-05 18:31         ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080605095033.GC5946@mithlond.arda.local \
    --to=tlikonen@iki.fi \
    --cc=adam@adamsimpkins.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).