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
This commit is contained in:
commit
6248be7678
10
git-stash.sh
10
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 () {
|
||||
|
Loading…
Reference in New Issue
Block a user