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

--simplify-merges returns too many references

From
Phil Hord <phil.hord@gmail.com>
Date
Jan 15, 2013, 23:12 UTC
Message-ID
<CABURp0q0nhka+ivrs3+m+3C1N+FfTq2zJ=1rWp34tfGNQ3b30g@mail.gmail.com>

I thought I understood the intent of the various history simplification switches, but maybe I am still confused.

In git.git, I see three commits which touch stripspace.c:

$ git log --oneline -- builtin/stripspace.c 497215d Update documentation for stripspace c2857fb stripspace: fix outdated comment 81b50f3 Move 'builtin-*' into a 'builtin/' subdirectory

With --full-history and also with --dense, I see the same three commits:

$ git log --full-history --oneline -- builtin/stripspace.c 497215d Update documentation for stripspace c2857fb stripspace: fix outdated comment 81b50f3 Move 'builtin-*' into a 'builtin/' subdirectory

$ git log --dense --oneline -- builtin/stripspace.c 497215d Update documentation for stripspace c2857fb stripspace: fix outdated comment 81b50f3 Move 'builtin-*' into a 'builtin/' subdirectory

But with --simplify-merges, I see _more_ commits.

$ git log --simplify-merges --oneline -- builtin/stripspace.c 634392b Add 'contrib/subtree/' from commit ... 497215d Update documentation for stripspace c2857fb stripspace: fix outdated comment 81b50f3 Move 'builtin-*' into a 'builtin/' subdirectory 610f043 Import branch 'git-p4' of git://repo.or.cz/fast-export b4d2b04 Merge git-gui 0a8f4f0 Merge git://git.kernel.org/pub/scm/git/gitweb 98e031f Merge git-tools repository under "tools" subdirectory 5569bf9 Do a cross-project merge of Paul Mackerras' gitk visualizer

None of the "new" commits touches this file. The man page suggests that simplify-merges should result in fewer commits than full-history.

"       --simplify-merges
       Additional option to --full-history to remove some needless merges from
       the resulting history, as there are no selected commits contributing to
       this merge."
Am I confused or is git?
Phil
Next: Junio C Hamano
Message 1 of 3 in “--simplify-merges returns too many references”
  1. Phil HordJan 15, 2013
  2. Junio C HamanoJan 15, 2013
  3. simplify-merges: drop merge from irrelevant side branchJunio C Hamano, Jan 17, 2013

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.