git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: bug in "git log --graph" at the tail end?

From
Junio C Hamano <gitster@pobox.com>
Date
May 24, 2008, 01:39 UTC
Message-ID
<7vk5hkpjj5.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20080524010555.GA5385@adamsimpkins.net>
Adam Simpkins <adam@adamsimpkins.net> writes:
Show 8 quoted lines
> - Merge commits that have uninteresting parents print branch lines for
>   all of their parents, even the uninteresting ones.
>
>   This is just a cosmetic issue, but I agree it looks bad.  Perhaps the
>   best thing to do is not to display anything for the uninteresting
>   parents.  It might look a little confusing to some users though, since
>   you can have a merge commit that is printed as 'M', but it only has
>   one parent displayed in the graph.

Ah, I was also going to suggest you _not_ to use 'M' at all. In other words, I do not see anything wrong if you drew the graph like this:

      *   1af8bca... Merge branch 'maint'
     /|
    | *   008442f... Merge branch 'maint-1.5.4' into maint
    | * e77b0b5... git-am: fix typo in usage message
    | * 74190d2... doc/git-daemon: s/uploadarchive/uploadarch/
Previous: Adam SimpkinsNext: Adam Simpkins
Message 4 of 15 in “bug in "git log --graph" at the tail end?”
  1. Junio C HamanoMay 23, 2008
  2. Reece DunnMay 23, 2008
  3. Adam SimpkinsMay 24, 2008
  4. Junio C HamanoMay 24, 2008
  5. 0/2 fix "log --graph" issues with uninteresting parentsAdam Simpkins, May 24, 2008
  6. 1/2 graph API: fix graph mis-alignment after uninteresting commitsAdam Simpkins, May 24, 2008
  7. 2/2 graph API: don't print branch lines for uninteresting merge parentsAdam Simpkins, May 24, 2008
  8. Teemu LikonenMay 24, 2008
  9. 0/1 graph API: always print 'M' for merge commitsAdam Simpkins, May 24, 2008
  10. 1/1 graph API: always print 'M' for merge commitsAdam Simpkins, May 24, 2008
  11. Adam SimpkinsMay 24, 2008
  12. Junio C HamanoMay 25, 2008
  13. Teemu LikonenMay 25, 2008
  14. Adam SimpkinsMay 25, 2008
  15. Adam SimpkinsMay 24, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.