undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* jc/stash-pop-not-popped:
  stash pop: mention we did not drop the stash upon failing to apply
This commit is contained in:
Junio C Hamano 2014-04-03 13:39:03 -07:00
commit 6248be7678
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
git-stash.sh
View File

@ -512,8 +512,14 @@ apply_stash () {
pop_stash() { pop_stash() {
assert_stash_ref "$@" assert_stash_ref "$@"
apply_stash "$@" && if apply_stash "$@"
then
drop_stash "$@" drop_stash "$@"
else
status=$?
say "The stash is kept in case you need it again."
exit $status
fi
} }
drop_stash () { drop_stash () {