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

Re: Requirements for integrating a new git subcommand

From
Eric S. Raymond <esr@thyrsus.com>
Date
Nov 26, 2012, 04:49 UTC
Message-ID
<20121126044922.GA14505@thyrsus.com>
In-Reply-To
<7vmwy5xe9n.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com>:
Show 18 quoted lines
> "Eric S. Raymond" <esr@thyrsus.com> writes:
> 
> > While the weave operation can build a commit graph with any structure
> > desired, an important restriction of the inverse (unraveling)
> > operation is that it operates on *master branches only*. The unravel
> > operation discards non-master-branch content, emitting a warning 
> > to standard error when it has to do so.
> 
> Imagine that I have a simple four-commit diamond:
> 
>     I---A
>      \   \
>       B---M
> 
> where Amy and Bob forked the initial commit made by Ian and created
> one commit each, and their branches were merged into one 'master'
> branch by a merge commit made by Mac.  How many state snapshots will
> I see when I ask you to unravel this?  Three, or four?

You will see four tree states. I have managed to remove the master-branch-only restriction.

> As to the procedural stuff, I think others have sufficiently
> answered already.  If I may add something, a new stuff typically
> start its life in contrib/ before it proves to be useful.

Thank you, I have submitted a documentation patch which folds in the on-list discussion.

As a separate point...are you requesting that I submit my integration patch to drop git-weave in contrib? If so, I will of course comply.

But I will point out that git-weave is not a half-thought out experiment; it is fully documented and has a functional test. The case for its usefulness is bolstered by one previous contrib script, which the author has agreed to retire in favor of git-weave.

-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>
Previous: Junio C Hamano
Message 12 of 12 in “Requirements for integrating a new git subcommand”
  1. Eric S. RaymondNov 22, 2012
  2. Shawn PearceNov 22, 2012
  3. Eric S. RaymondNov 22, 2012
  4. Michael J GruberNov 23, 2012
  5. Eric S. RaymondNov 23, 2012
  6. Christian CouderNov 23, 2012
  7. Eric S. RaymondNov 23, 2012
  8. Peter KreftingNov 23, 2012
  9. Eric S. RaymondNov 23, 2012
  10. Peter KreftingNov 26, 2012
  11. Junio C HamanoNov 26, 2012
  12. Eric S. RaymondNov 26, 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.