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

Re: q: faster way to integrate/merge lots of topic branches?

From
Linus Torvalds <torvalds@linux-foundation.org>
Date
Jul 23, 2008, 18:04 UTC
Message-ID
<alpine.LFD.1.10.0807231100310.4754@woody.linux-foundation.org>
In-Reply-To
<20080723140441.GA9537@elte.hu>
Ahh, missed that somebody already suggested it.
On Wed, 23 Jul 2008, Ingo Molnar wrote:
Show 13 quoted lines
> 
> hm, it's very slow:
> 
>   $ time git branch --no-merged
>   [...]
> 
>   real    0m9.177s
>   user    0m9.027s
>   sys     0m0.129s
> 
> when running it on tip/master:
> 
>   http://people.redhat.com/mingo/tip.git/README

We can probably speed it up, but more importantly, even if we don't, it's slow _once_.

It's worth taking a 9s hit, if that means that you can then skip half of the merges entirely, and thus win half of the 53s cost.

But I'll look if there's a way to cut it down from 9s. I suspect it has to traverse the whole history to make 100% sure that something isn't merged, but even that should be faster than 9s.

		Linus
Previous: Ingo MolnarNext: Linus Torvalds
Message 22 of 32 in “q: faster way to integrate/merge lots of topic branches?”
  1. Ingo MolnarJul 23, 2008
  2. Ingo MolnarJul 23, 2008
  3. Ingo MolnarJul 23, 2008
  4. Jay SoffianJul 23, 2008
  5. Ingo MolnarJul 23, 2008
  6. Ingo MolnarJul 23, 2008
  7. Andreas EricssonJul 23, 2008
  8. Ingo MolnarJul 23, 2008
  9. Miklos VajnaJul 23, 2008
  10. Sergey VlasovJul 23, 2008
  11. Ingo MolnarJul 23, 2008
  12. Ingo MolnarJul 23, 2008
  13. SZEDER GáborJul 23, 2008
  14. Ingo MolnarJul 23, 2008
  15. Junio C HamanoJul 23, 2008
  16. 1/2 builtin-branch.c: remove unused code in append_ref() callback functionJunio C Hamano, Jul 23, 2008
  17. builtin-branch.c: optimize --merged and --no-mergedJunio C Hamano, Jul 23, 2008
  18. Lars HjemliJul 24, 2008
  19. Nanako ShiraishiJul 24, 2008
  20. Lars HjemliJul 24, 2008
  21. Ingo MolnarJul 24, 2008
  22. Linus TorvaldsJul 23, 2008
  23. Linus TorvaldsJul 23, 2008
  24. Junio C HamanoJul 23, 2008
  25. Ingo MolnarJul 24, 2008
  26. Junio C HamanoJul 25, 2008
  27. Björn SteinbrinkJul 23, 2008
  28. Santi BéjarJul 23, 2008
  29. Linus TorvaldsJul 23, 2008
  30. Pierre HabouzitJul 23, 2008
  31. Pierre HabouzitJul 23, 2008
  32. Pierre HabouzitJul 23, 2008

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.