fix: fixupAll flag should take precedence over autorebase#593
Merged
Conversation
When running `git node land <pr> --autorebase --fixupAll`, ncu should squash all the commits first, then ignore the `--autorebase` flag as there is only one commit left. Refs: nodejs/node#40696 (comment)
Codecov Report
@@ Coverage Diff @@
## main #593 +/- ##
=======================================
Coverage 80.19% 80.19%
=======================================
Files 37 37
Lines 1828 1828
=======================================
Hits 1466 1466
Misses 362 362 Continue to review full report at Codecov.
|
targos
approved these changes
Nov 14, 2021
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
When running
git node land <pr> --autorebase --fixupAll, ncu should squash all the commits first, then ignore the--autorebaseflag as there is only one commit left.This comes up in the CQ for nodejs/node repo, we could fix the CQ script so it only supply one flag or the other, but since I didn't find any documentation stating the
--fixupAllis ignored when using--autorebase, I thought it would be worth fixing it.Refs: nodejs/node#40696 (comment)