diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-24 12:21:59 -0700 |
| commit | bfb539bb734ee4bc63bf2a6010f935caa78b2b79 (patch) | |
| tree | 3ef9de069c6b448fdb8ea54a6cc78da84e2f9ead /git-stash.sh | |
| parent | Merge branch 'pa/auto-gc-mac-osx' (diff) | |
| parent | Revert "stash: require a clean index to apply" (diff) | |
| download | tgif-bfb539bb734ee4bc63bf2a6010f935caa78b2b79.tar.xz | |
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-x | git-stash.sh | 2 |
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) || |