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

[PATCH 0/3] rev-list --simplify-{merges,by-decoration} --first-parent

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 8, 2012, 22:53 UTC
Message-ID
<1339196009-14555-1-git-send-email-gitster@pobox.com>

The deeper history simplification using merge information (not to be confused with "merge simplification") was not prepared to be used with the --first-parent option, but it was possible to trigger this combination from gitk.

The fix is fairly straight-forward. When showing only first-parent chain of history, the later parents won't matter in the result, so we can just rewrite the parents and make the history a single strand of pearls.

Showing first-parent-only history and then attempting to simplify merges does not make much sense, but simplify-by-decoration may be a valid thing to ask.

Junio C Hamano (3):
  revision: "simplify" options imply topo-order sort
  revision: note the lack of free() in simplify_merges()
  revision: cull side parents before running simplify-merges
 revision.c | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)
-- 
1.7.11.rc2.29.g85b30f3
Next: Junio C Hamano
Message 1 of 4 in “rev-list --simplify-{merges,by-decoration} --first-parent”
  1. 0/3 rev-list --simplify-{merges,by-decoration} --first-parentJunio C Hamano, Jun 8, 2012
  2. 1/3 revision: "simplify" options imply topo-order sortJunio C Hamano, Jun 8, 2012
  3. 2/3 revision: note the lack of free() in simplify_merges()Junio C Hamano, Jun 8, 2012
  4. 3/3 revision: cull side parents before running simplify-mergesJunio C Hamano, Jun 8, 2012

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.