-
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
feat(scoop-update): Stash uncommitted changes before update #5091
Conversation
I think you missed the But on a second note, stashing changes is an unexpected behaviour for users. I think it is just better to fail the update (and Git automatically shows the reason why the update failed). It is important to let users know they have uncommitted changes, fail gracefully, and then let the user decide whether to stash the changes themselves.
Bucket update sometimes fail due to EOL conflicts, this change will create multiple stashes there and somewhat pollute the working tree. |
I'll add a config option to control it: stash, prompt, cancel.
Sometimes the stashes should be removed easily then |
Co-authored-by: Rashil Gandhi <[email protected]>
Any other comments? This should be merged now. |
Description
Auto stash uncommitted changes of scoop before update.
Now the action is done in scoop core, should this be applied to buckets too?
Motivation and Context
scoop (un)hold scoop
#5089 (comment)How Has This Been Tested?
And this could be tested by checking out this PR, adding some dummy files in scoop dir and running
scoop update
.Checklist:
develop
branch.