summaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-06-24 12:21:59 -0700
committerJunio C Hamano <gitster@pobox.com>2015-06-24 12:21:59 -0700
commitbfb539bb734ee4bc63bf2a6010f935caa78b2b79 (patch)
tree3ef9de069c6b448fdb8ea54a6cc78da84e2f9ead /git-stash.sh
parent3072ec397c06af6abb693287928e39f3b8f3ae4d (diff)
parent19376104a8251a7e6c56579cdcd2eb0a106d1fd6 (diff)
downloadgit-bfb539bb734ee4bc63bf2a6010f935caa78b2b79.tar.gz
Merge branch 'jk/stash-require-clean-index'
A hotfix for the topic already in 'master'. * jk/stash-require-clean-index: Revert "stash: require a clean index to apply"
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh2
1 files changed, 0 insertions, 2 deletions
diff --git a/git-stash.sh b/git-stash.sh
index 1f5ea877d7..8e9e2cd7d5 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -457,8 +457,6 @@ 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) ||