From: Matthew Ogilvie <mmogilvi_git@miniinfo.net>
To: Pierre Penninckx <ibizapeanut@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/4] subtree: support split --rejoin --squash
Date: Wed, 22 Jan 2014 20:59:23 -0700 [thread overview]
Message-ID: <20140123035923.GA4176@comcast.net> (raw)
In-Reply-To: <CAMzgWy18wH4_Ds00x7UASQjLgN8LiEucFSZFp-5PJio_pEwmnA@mail.gmail.com>
On Wed, Jan 22, 2014 at 03:58:28PM +0100, Pierre Penninckx wrote:
> 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 parent reply other threads:[~2014-01-23 4:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20131207185853.GA3353@comcast.net>
[not found] ` <CAMzgWy18wH4_Ds00x7UASQjLgN8LiEucFSZFp-5PJio_pEwmnA@mail.gmail.com>
2014-01-23 3:59 ` Matthew Ogilvie [this message]
2014-01-23 8:51 ` [PATCH 1/4] subtree: support split --rejoin --squash Pierre Penninckx
2014-01-23 14:42 ` Matthew Ogilvie
2013-11-28 22:58 [PATCH] subtree: add squash handling for split and push Pierre Penninckx
2013-12-07 18:21 ` [PATCH 1/4] subtree: support split --rejoin --squash Matthew Ogilvie
2013-12-10 22:46 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140123035923.GA4176@comcast.net \
--to=mmogilvi_git@miniinfo.net \
--cc=git@vger.kernel.org \
--cc=ibizapeanut@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).