Skip to content

/ node-core-utils

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

Jump to bottom

git node land simplifications #425

Closed
BridgeAR opened this issue May 24, 2020 · 5 comments
Closed

git node land simplifications #425

BridgeAR opened this issue May 24, 2020 · 5 comments
Assignees
@mmarchini
Labels
enhancement git-node stale

Comments

@BridgeAR
Copy link
Member

@BridgeAR BridgeAR commented May 24, 2020 •
edited

It should be possible to anticipate the next command. For example in case a rebase is needed due to multiple commits. In such case, it would be nice to already execute the command that is currently printed to the terminal:

There are 3 commits in the PR
Please run the following commands to complete landing

$ git rebase origin/master -i -x "git node land --amend"
$ git node land --continue

It would be good to already run git rebase origin/master -i -x "git node land --amend". Even git node land --continue should be possible to run automatically as soon as that's done.

Removing the temporary files should also be done by default. A user might opt out by a config flag instead?
@mmarchini
Copy link
Member

@mmarchini mmarchini commented May 27, 2020

I like it, as long as there's an opt-out flag. I landed a commit recently with a mix of fixup! commits and GitHub suggestion commits and --autosquash got the commit order very wrong (enough to cause conflicts, had to rerun land and skip --autosquash).
@BridgeAR
Copy link
Member Author

@BridgeAR BridgeAR commented May 30, 2020

We should also automatically check if local master branch is already up to date and skip the suggestion (Do you want to try reset the local master branch to upstream/master? No) to update it in case it's already up to date.
@BridgeAR
Copy link
Member Author

@BridgeAR BridgeAR commented May 30, 2020

Another improvement would be to ask if the user wants to push the commit (To finish landing: 1. Run git push upstream master). That way there's one less command to enter into the command line. Ideally that command would also update the fork's remote as well.
BridgeAR added a commit to BridgeAR/node-core-utils that referenced this issue May 30, 2020
@BridgeAR
git-node: automatically remove temporary files
92f58cb 
Refs: nodejs#425
@BridgeAR BridgeAR mentioned this issue May 30, 2020
Merged
BridgeAR added a commit to BridgeAR/node-core-utils that referenced this issue May 30, 2020
@BridgeAR
git-node: auto amend metadata and open manual amend on request
e8646d0 
This makes sure manual amend is started in case the user requested
that without the need to edit any intermediate files.

Refs: nodejs#425
@BridgeAR BridgeAR mentioned this issue May 30, 2020
Closed
BridgeAR added a commit to BridgeAR/node-core-utils that referenced this issue May 30, 2020
@BridgeAR
git-node: ask to push commits and copy to clipboard
642452c 
Refs: nodejs#428
Refs: nodejs#425
@BridgeAR BridgeAR mentioned this issue May 30, 2020
Closed
codebytere pushed a commit that referenced this issue Jun 2, 2020
@BridgeAR
git-node: automatically remove temporary files (#429)
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
d3816ad 
Refs: #425
@mmarchini
Copy link
Member

@mmarchini mmarchini commented Aug 12, 2020

We should also automatically check if local master branch is already up to date and skip the suggestion (Do you want to try reset the local master branch to upstream/master? No) to update it in case it's already up to date.

Another improvement would be to ask if the user wants to push the commit (To finish landing: 1. Run git push upstream master). That way there's one less command to enter into the command line. Ideally that command would also update the fork's remote as well.

--yes will skip all questions as long as no checks failed (should cover both cases)
@mmarchini mmarchini self-assigned this Aug 12, 2020
@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Nov 11, 2020

This issue is stale because it has been open many days with no activity. It will be closed soon unless the stale label is removed or a comment is made.
@github-actions github-actions bot added the stale label Nov 11, 2020
@github-actions github-actions bot closed this Nov 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@mmarchini mmarchini

Labels
enhancement git-node stale
Projects
None yet
Milestone
No milestone
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
2 participants
@mmarchini @BridgeAR
You can’t perform that action at this time.