mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jc/stash-pop-not-popped'
"stash pop", upon failing to apply the stash, refrains from discarding the stash to avoid information loss. Be more explicit in the error message. The wording may want to get a bit more bikeshedding. * jc/stash-pop-not-popped: stash pop: mention we did not drop the stash upon failing to apply
This commit is contained in:
commit
10bdb20d6a
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 a new issue