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"

diff --git a/git-stash.sh b/git-stash.sh
index 0fddd5424b3846aaa6d9189841dae13c764468cd..23bd1d3db2a8097e901726add2476dd7090ee337 100755 (executable)
--- 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) ||

diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 7396ca991132a88012955a281a71c330eab2092b..f5f18b7d21c00da258125a9125a46b32cf9e8504 100755 (executable)
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -45,13 +45,6 @@ test_expect_success 'applying bogus stash does nothing' '
        test_cmp expect file
 '
 
-test_expect_success 'apply requires a clean index' '
-       test_when_finished "git reset --hard" &&
-       echo changed >other-file &&
-       git add other-file &&
-       test_must_fail git stash apply
-'
-
 test_expect_success 'apply does not need clean working directory' '
        echo 4 >other-file &&
        git stash apply &&