Skip to content
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

fix: fixupAll flag should take precedence over autorebase #593

Merged
merged 1 commit into from
Nov 17, 2021

Conversation

aduh95
Copy link
Contributor

@aduh95 aduh95 commented Nov 12, 2021

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.

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 --fixupAll is ignored when using --autorebase, I thought it would be worth fixing it.

Refs: nodejs/node#40696 (comment)

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
Copy link

codecov bot commented Nov 12, 2021

Codecov Report

Merging #593 (15a39ac) into main (9029c9c) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

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

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9029c9c...15a39ac. Read the comment docs.

@targos targos merged commit b62fe29 into nodejs:main Nov 17, 2021
@aduh95 aduh95 deleted the fixupAll-autorebase branch November 17, 2021 21:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants