-
Notifications
You must be signed in to change notification settings - Fork 278
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
Implement branch.squash
#5696
Conversation
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. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Go ahead and merge w/ resolving conflict; It looks like the case just needs to be copied over in HandleInput
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