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

Re: merge-base: update the clean-up postprocessing

From
Junio C Hamano <junkio@cox.net>
Date
Jul 5, 2006, 07:51 UTC
Message-ID
<7vejx0cwwj.fsf@assigned-by-dhcp.cox.net>
In-Reply-To
<7vy7v8dctz.fsf@assigned-by-dhcp.cox.net>

A fixed up version of this patch, along with your updated test, is at the tip of "pu".

It does affect the processing time for cases where there are more than one merge bases negatively. To compute all merge-base for the 23 merges in the kernel reporitory, the old code with the "contaminate the well a bit more" clean-up phase takes 2.5 seconds, while the new code takes 3.9 seconds.

Processing all 2215 merges in the kernel repository (the other 2192 merges have one merge-base between the parents) takes 160 seconds either way. In other words, multi merge-base merges are relatively rare and a bit more time spent to clean-up with the new code is lost in the noise.

The numbers are taken from /usr/bin/time on an Athron 64X2 3800.
Previous: Junio C HamanoNext: Junio C Hamano
Message 6 of 8 in “Additional merge-base tests (revised)”
  1. Additional merge-base tests (revised)A Large Angry SCM, Jul 5, 2006
  2. merge-base: update the clean-up postprocessingJunio C Hamano, Jul 5, 2006
  3. Johannes SchindelinJul 5, 2006
  4. Junio C HamanoJul 5, 2006
  5. Junio C HamanoJul 5, 2006
  6. Junio C HamanoJul 5, 2006
  7. Junio C HamanoJul 11, 2006
  8. Johannes SchindelinJul 11, 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.