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

abort doesn't undo reset #198

Closed
bmeck opened this issue Mar 5, 2018 · 3 comments
Closed

abort doesn't undo reset #198

bmeck opened this issue Mar 5, 2018 · 3 comments
Labels

Comments

@bmeck
Copy link
Member

bmeck commented Mar 5, 2018

When you run git node land --abort it resets the branch but then does not undo that once it aborts. This can lead to some confusion since it leaves the branch without the commits it included previously. So this can lead to odd looking behavior when you sync your branch back up to github and/or detached HEAD. See nodejs/node#18914 (comment) for example of confusion caused by this.

@gibfahn
Copy link
Member

gibfahn commented Mar 5, 2018

Copy-pasting @joyeecheung 's comment from nodejs/node#18914 (comment):

@joyeecheung bradley mentioned ncu, was node land final for single commits ever fixed? it could be related

I could not reproduce that so no sure how to get it fixed though....

@bmeck Did you run git node land --abort on your PR branch? That would reset your PR branch to upstream/master (but it will prompt you first before doing the reset). I guess if you push the upstream/master head to this branch, then github might auto close it since there is nothing to merge - but I am pretty sure you'll have to force-push to this branch to make that happen. Have you force pushed?

@gibfahn
Copy link
Member

gibfahn commented Mar 5, 2018

I guess we could warn/prompt before allowing the running of commands like git node land --abort on a branch that isn't master or v[0-9].x*.

@bmeck
Copy link
Member Author

bmeck commented Mar 5, 2018

this source of my confusion might be addressed in #200

@bmeck bmeck closed this as completed Mar 5, 2018
joyeecheung added a commit that referenced this issue Mar 5, 2018
It now refuses to run if

1. User has not configured upstream or branch - no more defaults.
2. User is not on the branch configured
3. User is on detached HEAD

Refs: nodejs/node#18914
Fixes: #198
johnfrench3 pushed a commit to johnfrench3/core-utils-node that referenced this issue Nov 2, 2022
It now refuses to run if

1. User has not configured upstream or branch - no more defaults.
2. User is not on the branch configured
3. User is on detached HEAD

Refs: nodejs/node#18914
Fixes: nodejs/node-core-utils#198
renawolford6 added a commit to renawolford6/node-dev-build-core-utils that referenced this issue Nov 10, 2022
It now refuses to run if

1. User has not configured upstream or branch - no more defaults.
2. User is not on the branch configured
3. User is on detached HEAD

Refs: nodejs/node#18914
Fixes: nodejs/node-core-utils#198
Developerarif2 pushed a commit to Developerarif2/node-core-utils that referenced this issue Jan 27, 2023
It now refuses to run if

1. User has not configured upstream or branch - no more defaults.
2. User is not on the branch configured
3. User is on detached HEAD

Refs: nodejs/node#18914
Fixes: nodejs/node-core-utils#198
gerkai added a commit to gerkai/node-core-utils-project-build that referenced this issue Jan 27, 2023
It now refuses to run if

1. User has not configured upstream or branch - no more defaults.
2. User is not on the branch configured
3. User is on detached HEAD

Refs: nodejs/node#18914
Fixes: nodejs/node-core-utils#198
shovon58 pushed a commit to shovon58/node-core-utils that referenced this issue Jun 9, 2023
It now refuses to run if

1. User has not configured upstream or branch - no more defaults.
2. User is not on the branch configured
3. User is on detached HEAD

Refs: nodejs/node#18914
Fixes: nodejs/node-core-utils#198
patrickm68 added a commit to patrickm68/NodeJS-core-utils that referenced this issue Sep 14, 2023
It now refuses to run if

1. User has not configured upstream or branch - no more defaults.
2. User is not on the branch configured
3. User is on detached HEAD

Refs: nodejs/node#18914
Fixes: nodejs/node-core-utils#198
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

3 participants