Merge branch 'jc/stash-pop-not-popped' into maint

* jc/stash-pop-not-popped: stash pop: mention we did not drop the stash upon failing to apply
git-mirror · Apr 3, 2014 · 6248be7 · 6248be7
2 parents 0a01752 + 2d4c993
commit 6248be7
Showing 1 changed file with 8 additions and 2 deletions.
diff --git 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 () {