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

[PATCH 0/4] "merge-base" updates

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 30, 2012, 23:13 UTC
Message-ID
<1346368388-23576-1-git-send-email-gitster@pobox.com>

This replaces the topmost commit from the earlier series that tried to optimize N*(N-1) loop with N traversals. With this, running the following script in the kernel repository:

-- >8 -- #!/bin/sh

git rev-list --committer=torvalds@linux-foundation.org \
    --max-parents=2 --min-parents=2 --parents v3.5..v3.6-rc2 >RL
cmd='
	while read result parent1 parent2
	do
		$GIT merge-base $parent1 $parent2
	done <RL
'

GIT="rungit master" time sh -c "$cmd" >:stock GIT=../git.git/git time sh -c "$cmd" >:optim cmp :stock :optim -- 8< --

shows a slight but measurable boost in the performance of merge-base itself.

42.45user 3.79system 0:46.62elapsed 99%CPU (0avgtext+0avgdata 408176maxresident)k 0inputs+24outputs (0major+2708085minor)pagefaults 0swaps 39.99user 3.42system 0:43.27elapsed 100%CPU (0avgtext+0avgdata 408192maxresident)k 0inputs+24outputs (0major+2179604minor)pagefaults 0swaps

Junio C Hamano (4):
  merge_bases_many(): split out the logic to paint history
  merge-base: "--is-ancestor A B"
  in_merge_bases(): use paint_down_to_common()
  get_merge_bases_many(): walk from many tips in parallel
 builtin/merge-base.c |  21 ++++++++
 commit.c             | 143 +++++++++++++++++++++++++++++++++------------------
 2 files changed, 114 insertions(+), 50 deletions(-)
-- 
1.7.12.293.g6aeebca
Next: Junio C Hamano
Message 1 of 9 in “"merge-base" updates”
  1. 0/4 "merge-base" updatesJunio C Hamano, Aug 30, 2012
  2. 1/4 merge_bases_many(): split out the logic to paint historyJunio C Hamano, Aug 30, 2012
  3. 2/4 merge-base: "--is-ancestor A B"Junio C Hamano, Aug 30, 2012
  4. Martin von ZweigbergkAug 31, 2012
  5. Junio C HamanoAug 31, 2012
  6. Martin von ZweigbergkAug 31, 2012
  7. Junio C HamanoAug 31, 2012
  8. 3/4 in_merge_bases(): use paint_down_to_common()Junio C Hamano, Aug 30, 2012
  9. 4/4 get_merge_bases_many(): walk from many tips in parallelJunio C Hamano, Aug 30, 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.