Hi again, After using the patched git-subtree (with patches 1 to 3) for a while, I suspect the added functionality does not do exactly what I wanted. So yes, now when doing a rejoin, the squash of the split commits is used. But how can I push this squash instead of the individual commits? The problem is I don't know how to reference that squashed commit.
I tried adding the --branch option but it adds the branch to the top of the individual commits so no luck there. This is maybe obvious but I'm not at ease with commit references in git. Pierre 2014/1/23 Matthew Ogilvie <mmogilvi_...@miniinfo.net>: > On Wed, Jan 22, 2014 at 03:58:28PM +0100, Pierre Penninckx wrote: >> 2013/12/7 Matthew Ogilvie <mmogilvi_...@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_...@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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
