diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-04-03 20:39:03 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-03 20:39:03 (GMT) |
| commit | 6248be7678ad2c262a460c052ef4f28744e75cc4 (patch) | |
| tree | a2f7250376bcf36926791a73cde9615dd70111af | |
| parent | 0a01752ad32169cee96bde4d6a2b218c1ebac46a (diff) | |
| parent | 2d4c99339210d43a84841a71a50e88a050d9e21b (diff) | |
| download | git-6248be7678ad2c262a460c052ef4f28744e75cc4.zip git-6248be7678ad2c262a460c052ef4f28744e75cc4.tar.gz git-6248be7678ad2c262a460c052ef4f28744e75cc4.tar.bz2 | |
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
| -rwxr-xr-x | git-stash.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/git-stash.sh b/git-stash.sh index f0a94ab..4798bcf 100755 --- a/git-stash.sh +++ b/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 () { |