-
Notifications
You must be signed in to change notification settings - Fork 277
Implement branch.squash
#5696
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
ChrisPenner
wants to merge
11
commits into
trunk
Choose a base branch
from
cp/branch-squash
base: trunk
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Implement branch.squash
#5696
Conversation
This file contains hidden or 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
667ab34
to
3d2a04b
Compare
92f457b
to
32af9f6
Compare
Build failures aside this seems good to me! |
I've finally wrangled myself into passing transcripts haha @aryairani |
We'll have to re-run transcripts after merging #5705, so I'll hold off until after that. |
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.
Overview
Implements
branch.squash
by request from @ceedubs and @stew, which should allow them to creating small sync files quickly which will be nice for speeding up some of their docker builds.Note that there still doesn't appear to be a
clone.squashed
, which would probably be nice for testing trunk builds 🤔Implementation notes
branch.squash
command.branch.squash src dest
squashes src into dest. Where src and dest can beproject/branch
/branch
etc.Interesting/controversial decisions
I started by allowing it to accept a causal hash, path, etc. but the input parsing drove me nuts so I backstepped to something simpler.
Test coverage
Transcripts