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

Re: simple cvs-like git wrapper

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 31, 2008, 06:17 UTC
Message-ID
<7v63xafrit.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<20080131040839.GW24004@spearce.org>
"Shawn O. Pearce" <spearce@spearce.org> writes:
Show 7 quoted lines
> This is going to be slow as you are running git-merge for each
> and every branch available to you.  You can do a lot better by
> loading the branch DAG into memory in Perl/C/Python and doing a
> graph coloring algorithm to see if a merge is necessary or not,
> as if you are merging everything all of the time almost everything
> is going to be always merged to everything else.  Which as I said
> earlier is nuts.

I guess you can ask "show-branch --independent" to cull branches that are pure subset of other branches.

But no matter how you do this, the resulting history would be less efficient to bisect if you make Octopus.

As you can ask "git log --no-merges" to omit merges from the listing, I am not sure if it is worth it to avoid two-side merges and insist on making an Octopus these days.

Previous: Shawn O. PearceNext: Daniel Barkalow
Message 9 of 15 in “simple cvs-like git wrapper”
  1. Ed S. PeschkoJan 29, 2008
  2. Jakub NarebskiJan 29, 2008
  3. Ed S. PeschkoJan 30, 2008
  4. Shawn O. PearceJan 30, 2008
  5. Ed S. PeschkoJan 30, 2008
  6. Shawn O. PearceJan 31, 2008
  7. Ed S. PeschkoJan 31, 2008
  8. Shawn O. PearceJan 31, 2008
  9. Junio C HamanoJan 31, 2008
  10. Daniel BarkalowJan 30, 2008
  11. Kate RhodesFeb 1, 2008
  12. Johannes SchindelinFeb 1, 2008
  13. Jakub NarebskiFeb 1, 2008
  14. Uwe Kleine-KönigFeb 1, 2008
  15. Jakub NarebskiFeb 1, 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.