bughelp wantedpriority-2
説明
Description
Rebasing from a branch to master with unstashed changes produces a dialog stating that the changes must be stashed or discarded. After this dialog is dismissed, all menu items under the Repository and Branch menus are disabled. They are reenabled upon restarting the application.
Version
- GitHub Desktop: 2.1.0
- Operating system: MacOS 10.14.5
Steps to Reproduce
- Have unstashed or uncommitted changes in your working branch
- Rebase current branch (Shift-Command-E on Mac)
- Select master and press
Begin Rebase(This may work rebasing to other branches as well, I have not tested) - An error dialog will show stating that there are unstaged changes - close this immediately
- The
RepositoryandBranchmenus will be entirely disabled.
Interestingly enough, if you wait ~10 seconds before closing the error dialog this behaviour does not occur.
Expected Behavior
Repository and Branch menus to not be disabled
Actual Behavior
Repository and Branch menus are disabled
Additional Information
Logs
Relevant lines:
2019-07-20T07:18:16.484Z - info: [ui] [rebase] starting rebase for ui-modification at f9c7799c6768accac71d6c158350f697a17e28ef
2019-07-20T07:18:16.485Z - info: [ui] [rebase] to restore the previous state if this completed rebase is unsatisfactory:
2019-07-20T07:18:16.485Z - info: [ui] [rebase] - git checkout ui-modification
2019-07-20T07:18:16.486Z - info: [ui] [rebase] - git reset f9c7799c6768accac71d6c158350f697a17e28ef --hard
2019-07-20T07:18:16.640Z - error: [ui] `git rebase master ui-modification` exited with an unexpected code: 1.
stderr:
Cannot rebase: You have unstaged changes.
Please commit or stash them.
2019-07-20T07:18:16.659Z - info: [ui] [rebase] completed rebase - got Error and on tip f9c7799c6768accac71d6c158350f697a17e28ef - kind Valid
2019-07-20T07:18:17.555Z - warn: [ui] [App] invalid state encountered - rebase flow should not be active when step is null