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

[PATCH v2 0/3] "log --first-parent --simplify-merges/by-decoration"

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 22, 2012, 22:27 UTC
Message-ID
<1340404061-11619-1-git-send-email-gitster@pobox.com>

It is unclear what it means to "simplify-merges" while traversing only the "first-parent" ancestry chain, but the combination of the options makes the simplification logic to use in-core commit objects that haven't been examined for relevance, either producing incorrect result or taking too long to produce any output.

Teach the simplification logic to ignore commits that the first-parent traversal logic ignored when both are in effect to work around the issue.

Junio C Hamano (3):
  revision: "simplify" options imply topo-order sort
  revision: note the lack of free() in simplify_merges()
  revision: ignore side parents while running simplify-merges
 revision.c | 41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)
-- 
1.7.11.1.29.gf71be5c
Next: Junio C Hamano
Message 1 of 4 in “"log --first-parent --simplify-merges/by-decoration"”
  1. 0/3 "log --first-parent --simplify-merges/by-decoration"Junio C Hamano, Jun 22, 2012
  2. 1/3 revision: "simplify" options imply topo-order sortJunio C Hamano, Jun 22, 2012
  3. 2/3 revision: note the lack of free() in simplify_merges()Junio C Hamano, Jun 22, 2012
  4. 3/3 revision: ignore side parents while running simplify-mergesJunio C Hamano, Jun 22, 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.