Merge branch 'jk/rebase-quiet-noop' into maint

diff --git a/git-stash.sh b/git-stash.sh
index d4cf818be9488f1b94fdf4766a8f73db6bfd1029..cc28368b01fc218f32ae98c21cce4d7f84c68eb0 100755 (executable)
--- 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) ||