fix: Subtree bug #38
Merged
fix: Subtree bug #38
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
-Adding the customized git subtree script to use for CI that included the subtree bugfix
AnthonyMDev
approved these changes
Sep 19, 2023
| @@ -0,0 +1,357 @@ | |||
| # This shell scriplet is meant to be included by other shell scripts | |||
There was a problem hiding this comment.
Is this a script you got from somewhere else? We just need to make sure we are checking the LICENSE and it's okay to reuse this.
There was a problem hiding this comment.
its part of git and required for the subtree script to run correctly
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
-Adding the customized git subtree script to use for CI that included the subtree bugfix
Discovered a bug in the
git subtreefunctionality where while performing a split of subtree 'A', if split commits for another subtree ('B' for example) are part of the commits to process since the last split/rejoin, then it causes the split processing to have to traverse the entire history of the second subtree 'B', even though those commits are irrelevant to the split being processed for subtree 'A'.I implemented a fix in the
git-subtree.shscript and have placed a custom version of that script in our repository temporarily for us to use for our workflow until the fix can be merged and released as part of an official git release, at which point these scripts can be removed and we will switch back to using the official release version of the subtree functionality.