node-core-utils icon indicating copy to clipboard operation
node-core-utils copied to clipboard

git node land simplifications

Open BridgeAR opened this issue 5 years ago • 5 comments

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 avatar May 24 '20 01:05 BridgeAR

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

mmarchini avatar May 27 '20 18:05 mmarchini

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 avatar May 30 '20 02:05 BridgeAR

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 avatar May 30 '20 02:05 BridgeAR

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 avatar Aug 12 '20 03:08 mmarchini

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[bot] avatar Nov 11 '20 00:11 github-actions[bot]