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

Re: [PATCH 1/4] subtree: support split --rejoin --squash

From
MOMatthew Ogilvie <mmogilvi_git@miniinfo.net>
Date
Jan 23, 2014, 03:59 UTC
Message-ID
<20140123035923.GA4176@comcast.net>
In-Reply-To
<CAMzgWy18wH4_Ds00x7UASQjLgN8LiEucFSZFp-5PJio_pEwmnA@mail.gmail.com>
On Wed, Jan 22, 2014 at 03:58:28PM +0100, Pierre Penninckx wrote:
Show 33 quoted lines
> 2013/12/7 Matthew Ogilvie <mmogilvi_git@miniinfo.net>
> > Subject: [PATCH 1/4] subtree: support split --rejoin --squash
> >
> > Allow using --squash with "git subtree split --rejoin".  It
> > will still split off (and save to --branch) the complete
> > subtree history, but the merge done for the "--rejoin" will
> > be merging a squashed representation of the new subtree
> > commits, instead of the commits themselves (similar to
> > how "git subtree merge --squash" works).
> >
> > Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
> > ---
> >
> > I can think of a couple of possible objections to this patch.
> > Are these (or any others) worth fixing?
> >
> > 1. Perhaps someone want the saved subtree (--branch) to have
> >    a squashed representation as well, as an option?  Maybe we
> >    need two different --squash options?  Something
> >    like "--rejoin-squash"?
> > 2. It could definitely use some automated tests.  In fact,
> >    pre-existing --squash functionality is hardly tested at
> >    all, either.
> >       See patch 4 comments for a script I use to help with
> >    mostly-manual testing.
>
> Sorry to bother you with this again, but I was wondering if those patches
> would be integrated into git anytime soon.
> And if not, if there is something I can do to help.
> 
> I found them by the way, thanks a lot!
> 
> Pierre

I'm not sure when or if the patches will make it in. Junio's weekly "What's cooking..." email has asked for "Comments?" about them for the past several weeks, but I have yet to see anyone actually comment about them.

Searching throught the last couple of years of mailing list archives for "subtree" reveals a general lack of a active maintainer(s) to help review and improve patches for "git subtree". Given the general lack of help and feedback, it is understandable that Junio has largely limited inclusion of subtree patches to trivially obvious bug fixes.

                        - Matthew Ogilvie
Next: Pierre Penninckx
Message 1 of 3 in “Re: [PATCH 1/4] subtree: support split --rejoin --squash”
  1. Matthew OgilvieJan 23, 2014
  2. Pierre PenninckxJan 23, 2014
  3. Matthew OgilvieJan 23, 2014

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.