diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-25 23:03:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-25 23:03:27 -0700 |
| commit | 351d06df519ee405a1926e0c6ee34d6a1dba6b46 (patch) | |
| tree | 10b8b7571b43748a993d2aa5d5eba2d1801c0ff1 /git-stash.sh | |
| parent | Merge branch 'cb/array-size' into maint (diff) | |
| parent | Revert "stash: require a clean index to apply" (diff) | |
| download | tgif-351d06df519ee405a1926e0c6ee34d6a1dba6b46.tar.xz | |
Merge branch 'jk/stash-require-clean-index' into maint
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 0fddd5424b..23bd1d3db2 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) || |