mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 20:51:42 +02:00
Code

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

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2014-02-26 14:18:54 -08:00
parent 2f93541d88
commit 2d4c993392
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
git-stash.sh
View File

@ -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 () {