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

[BUG] git-log shows first parent and repeated last for octopus merge

From
Jakub Narebski <jnareb@gmail.com>
Date
Oct 18, 2006, 11:11 UTC
Message-ID
<eh5242$rar$1@sea.gmane.org>

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...
 [...]
while git-show gives correct output
 1005:jnareb@roke:~/git> git show 211232bae64bcc60bbf5d1b5e5b2344c22ed767e
 commit 211232bae64bcc60bbf5d1b5e5b2344c22ed767e
 Merge: fc54a9c... 9e30dd7... c4b83e6... 6602659... b28858b...
 [...]
Same with git-rev-list, also shows correct output:
 1005:jnareb@roke:~/git> git rev-list --header --parents --max-count=1 \
   211232bae64bcc60bbf5d1b5e5b2344c22ed767e
 211232bae64bcc60bbf5d1b5e5b2344c22ed767e [...] 
 tree cdafa88fa4ed7fcc7bb6c64d62e2d7c4d3b65e42
 parent fc54a9c30ccad3fde5890d2c0ca2e2acc0848fbc
 parent 9e30dd7c0ecc9f10372f31539d0122db97418353
 parent c4b83e618f1df7d8ecc9392fa40e5bebccbe6b5a
 parent 660265909fc178581ef327076716dfd3550e6e7b
 parent b28858bf65d4fd6d8bb070865518ec43817fe7f3
 [...]

1008:jnareb@roke:~/git> git --version git version 1.4.2.1

-- 
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
Next: Johannes Schindelin
Message 1 of 6 in “[BUG] git-log shows first parent and repeated last for octopus merge”
  1. Jakub NarebskiOct 18, 2006
  2. Johannes SchindelinOct 18, 2006
  3. Jakub NarebskiOct 18, 2006
  4. When rewriting parents, cull duplicatesJohannes Schindelin, Oct 18, 2006
  5. Junio C HamanoOct 18, 2006
  6. A Large Angry SCMOct 18, 2006

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.