Skip to contentSkip to conversation

subtree: support split --rejoin --squash

PATCH Matthew Ogilvie 2 participants 3 messages Jun 15, 2016 2 messages not in the archive

lore
Share & tools
lore
#2 lore raw
In reply to a message not in the archive
Quoted 26 lines · Pierre Penninckx

2013/12/7 Matthew Ogilvie <[email protected]>

Quoted 15 lines

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).

---

I can think of a couple of possible objections to this patch. Are these (or any others) worth fixing?

Quoted 9 lines

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.

Quoted 7 lines

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

#3 lore raw

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 <[email protected]>:

Quoted 48 lines · Pierre Penninckx
Quoted 26 lines

2013/12/7 Matthew Ogilvie <[email protected]>

Quoted 15 lines

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).

---

I can think of a couple of possible objections to this patch. Are these (or any others) worth fixing?

Quoted 9 lines

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.

Quoted 7 lines

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

#4 lore raw
Quoted 9 lines · Pierre Penninckx

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.

Quoted 3 lines

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.

Note that there are essentially two trees output by subtree --join.

The first output is the main branch (with --join). With my patches and --squash, the main branch merges in a squashed representation of the subtree changes, so that the main project history doesn't have two copies of potentially tons of different commits in it's history (the original and the subtree, shown merged together).

The second output is the new branch tip of the subtree itself. My patch always outputs the full history of the subtree, not a squashed representation. This is what's different from your patch, and is what I wanted. If you want this subtree output to ALSO be squashed, then it would need another option to support this.

Note that there is at least one technical reason to prefer my strategy. "git subtree" tries to make it so you can re-run it (potentially from scratch) on the main project at any point in time, and re-generate exactly the same final subtree history, regardless of previous runs of "git subtree". But if some of that history was originally squashed, it currently has no way of knowing which commits should be squashed together to properly regenerate exactly the same subtree history. This is especially true if you use "--ignore-joins", which is currently the only practical workaround to the bug described in my patch 4 (about merging in history that originally branched off before the previous subtree split point). Perhaps this issue could be addressed by enhancing subtree to recognize specially-formatted squash messages, and intentionally regenerate the squashed based on them?

[Side note: I think the convention on this list is to respond inline or after the previous message, not at the top, so new people can more easily pick up the discussion.]

- Matthew

Quoted 49 lines

2014/1/23 Matthew Ogilvie <[email protected]>:

Quoted 48 lines · Pierre Penninckx
Quoted 26 lines

2013/12/7 Matthew Ogilvie <[email protected]>

Quoted 15 lines

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).

---

I can think of a couple of possible objections to this patch. Are these (or any others) worth fixing?

Quoted 9 lines

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.

Quoted 7 lines

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