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

git node land simplifications #425

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

git node land simplifications #425

BridgeAR opened this issue May 24, 2020 · 5 comments
Assignees
Labels
enhancement Things that enhances functionality, provided by node-core-utils git-node

Comments

@BridgeAR
Copy link
Member

BridgeAR commented May 24, 2020

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?

@BridgeAR BridgeAR added enhancement Things that enhances functionality, provided by node-core-utils git-node labels May 24, 2020
@mmarchini
Copy link
Contributor

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

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

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 added a commit to BridgeAR/node-core-utils that referenced this issue May 30, 2020
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 added a commit to BridgeAR/node-core-utils that referenced this issue May 30, 2020
@mmarchini
Copy link
Contributor

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

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
@targos targos removed the stale label Mar 3, 2021
@targos targos reopened this Mar 3, 2021
johnfrench3 pushed a commit to johnfrench3/core-utils-node that referenced this issue Nov 2, 2022
renawolford6 added a commit to renawolford6/node-dev-build-core-utils that referenced this issue Nov 10, 2022
Developerarif2 pushed a commit to Developerarif2/node-core-utils that referenced this issue Jan 27, 2023
gerkai added a commit to gerkai/node-core-utils-project-build that referenced this issue Jan 27, 2023
patrickm68 added a commit to patrickm68/NodeJS-core-utils that referenced this issue Sep 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Things that enhances functionality, provided by node-core-utils git-node
Projects
None yet
Development

No branches or pull requests

3 participants