Merge branch 'mh/remove-subtree-long-pathname-fix' into maint

diff --git a/git-stash.sh b/git-stash.sh
index f0a94abf1434c65d27caf4cd674f89de62e9333c..4798bcf0e51b705005215e9a6339310defe16d03 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -512,8 +512,14 @@ apply_stash () {
 pop_stash() {
        assert_stash_ref "$@"
 
-       apply_stash "$@" &&
-       drop_stash "$@"
+       if apply_stash "$@"
+       then
+               drop_stash "$@"
+       else
+               status=$?
+               say "The stash is kept in case you need it again."
+               exit $status
+       fi
 }
 
 drop_stash () {