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

git log --merges doesn't show commits as expected

From
DRDominik Rauch <dominik.rauch@gmx.at>
Date
Nov 13, 2015, 16:21 UTC
Message-ID
<AMSPR02MB168531F809E1625FACEB25283110@AMSPR02MB168.eurprd02.prod.outlook.com>
Hello!
 
(This is my first post to this mailing list and I couldn't find a FAQ section - please excuse me, if I haven't followed all the established posting guidelines yet.)
I have the following repository tree:
C
|\
| B
| /
A

Commit A: Parents=(). Initial commit. Contains file foo with content "ABC". Commit B: Parents=(A). Represents a commit on some feature branch. Contains file foo with content "XYZ". Commit C: Parents=(A, B). Represents a merge commit of a feature branch back to the main branch. Contains file foo with content "XYZ".

I expected "git log --merges foo" to show C, however, the log is empty! Specifying "--full-history" results in the correct history, therefore I assume, I misunderstand Git's default history simplification algorithm. Unfortunately, the example in the Git docs at [1] does not contain the very same situation (although it is probably one of the most common situations...).
Does anybody know why I don't see the log output I expect? I'm confused...even if the log output is correct, I don't think it follows the principle of least surprise...
Side note: specifying "--first-parent" also results in commit C being shown.

Best regards, Dominik

PS: This is a cross post of [2], somebody noted it could be a bug, which is why I decided to post to this mailing list.

[1] https://git-scm.com/docs/git-log#_history_simplification [2] http://stackoverflow.com/q/33695763/

Next: Jeff King
Message 1 of 2 in “git log --merges doesn't show commits as expected”
  1. Dominik RauchNov 13, 2015
  2. Jeff KingNov 13, 2015

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.