Commit 2d4c9933 authored by Junio C Hamano's avatar Junio C Hamano

stash pop: mention we did not drop the stash upon failing to apply

Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent 2f93541d
......@@ -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 () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment