Fixed issue #2376: Accidental stash-pops can so easily overwrite the uncommited working dir changes #154
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
YueLinHo
force-pushed
the
ylh/i2376
branch
2 times, most recently
from
0ae614f
to
8065118
Compare
|
@ch3cooli Updated. ^_^ Thanks. |
YueLinHo
changed the title
|
We should make this opt-in - if we want to have this. |
|
@csware
|
|
Exactly |
YueLinHo
changed the title
|
@csware |
…uncommited working dir changes Signed-off-by: Yue Lin Ho <b8732003@student.nsysu.edu.tw>
csware
force-pushed
the
master
branch
2 times, most recently
from
9d3e91b
to
85220c8
Compare
csware
force-pushed
the
master
branch
2 times, most recently
from
29728ee
to
aeea116
Compare
csware
force-pushed
the
master
branch
5 times, most recently
from
a8be543
to
f256eac
Compare
csware
force-pushed
the
master
branch
2 times, most recently
from
b64e51c
to
e78b37f
Compare
csware
force-pushed
the
master
branch
6 times, most recently
from
9e1a566
to
f7a14b0
Compare
csware
force-pushed
the
master
branch
2 times, most recently
from
e1c574d
to
2ee8f1b
Compare
csware
force-pushed
the
master
branch
2 times, most recently
from
cefea06
to
2370df1
Compare
|
There is a check in Git which prevents stash pop from overwriting uncommitted changes in the working tree. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
cf : Issue 2376
I don't think stash pop can easily overwrite the uncommited changes after reading this.
(After git 1.7.5.1, git drop dirty worktree check on apply.)
So, I think a warning message box is enough. agree?
If you disagree it, feel free to close this PR. :)
Also warn for git stash apply? Maybe not.