diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 12:38:20 -0700 |
| commit | 05ed24dc51700bc3a08d0778b7c5c7c342be8caf (patch) | |
| tree | 9d3894c29b1c1617b8bab8abe794428a3b5c9b4b /t | |
| parent | Merge branch 'pw/rebase-abort-clean-rewritten' into maint (diff) | |
| parent | stash: fix show referencing stash index (diff) | |
| download | tgif-05ed24dc51700bc3a08d0778b7c5c7c342be8caf.tar.xz | |
Merge branch 'tg/stash-ref-by-index-fix' into maint
"git stash show 23" used to work, but no more after getting
rewritten in C; this regression has been corrected.
* tg/stash-ref-by-index-fix:
stash: fix show referencing stash index
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3903-stash.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index ea30d5f6a0..b22e671608 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -708,6 +708,24 @@ test_expect_success 'invalid ref of the form "n", n >= N' ' git stash drop ' +test_expect_success 'valid ref of the form "n", n < N' ' + git stash clear && + echo bar5 >file && + echo bar6 >file2 && + git add file2 && + git stash && + git stash show 0 && + git stash branch tmp 0 && + git checkout master && + git stash && + git stash apply 0 && + git reset --hard && + git stash pop 0 && + git stash && + git stash drop 0 && + test_must_fail git stash drop +' + test_expect_success 'branch: do not drop the stash if the branch exists' ' git stash clear && echo foo >file && |