aboutsummaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2015-04-22 15:31:02 -0400
committerJunio C Hamano <gitster@pobox.com>2015-04-22 13:38:58 -0700
commited178ef13a26136d86ff4e33bb7b1afb5033f908 (patch)
tree9f938feddf21fa4a73cfa243d46ecb54639176c0 /git-stash.sh
parent88bab59c5bf8de2a1577c3134f4dff1e225409e2 (diff)
downloadgit-ed178ef13a26136d86ff4e33bb7b1afb5033f908.tar.gz
git-ed178ef13a26136d86ff4e33bb7b1afb5033f908.tar.xz
stash: require a clean index to apply
If you have staged contents in your index and run "stash apply", we may hit a conflict and put new entries into the index. Recovering to your original state is difficult at that point, because tools like "git reset --keep" will blow away anything staged. We can make this safer by refusing to apply when there are staged changes. It's possible we could provide better tooling here, as "git stash apply" should be writing only conflicts to the index (so we know that any stage-0 entries are potentially precious). But it is the odd duck; most "mergy" commands will update the index for cleanly merged entries, and it is not worth updating our tooling to support this use case which is unlikely to be of interest (besides which, we would still need to block a dirty index for "stash apply --index", since that case _would_ be ambiguous). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/git-stash.sh b/git-stash.sh
index d4cf818be..cc28368b0 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -442,6 +442,8 @@ apply_stash () {
assert_stash_like "$@"
git update-index -q --refresh || die "$(gettext "unable to refresh index")"
+ git diff-index --cached --quiet --ignore-submodules HEAD -- ||
+ die "$(gettext "Cannot apply stash: Your index contains uncommitted changes.")"
# current index state
c_tree=$(git write-tree) ||