# [PATCH 2/4] t3903-stash.sh: use test_must_fail instead of '!' notation 3 messages from 2008-03-02 to 2008-03-02. Participants: drafnel@gmail.com. Thread: https://gitlist.dev/t/12435 ## drafnel@gmail.com, 2008-03-02 20:58 Subject: [PATCH 2/4] t3903-stash.sh: use test_must_fail instead of '!' notation Message-ID: <5952365.1204491506490.JavaMail.teamon@b308.teamon.com> URL: https://gitlist.dev/e/5952365.1204491506490.JavaMail.teamon%40b308.teamon.com In-Reply-To: <1204491531-29758-1-git-send-email-drafnel@gmail.com> ``` Signed-off-by: Brandon Casey --- t/t3903-stash.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 50a2c83..2418f47 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -41,7 +41,7 @@ test_expect_success 'apply needs clean working directory' ' echo 4 > other-file && git add other-file && echo 5 > other-file && - ! git stash apply + test_must_fail git stash apply ' test_expect_success 'apply stashed changes' ' -- 1.5.4.3.412.gcd100 ``` ## drafnel@gmail.com, 2008-03-02 20:58 Subject: [PATCH 3/4] git-reflog.txt: Document new commands --updateref and --rewrite Message-ID: <15643506.1204491509692.JavaMail.teamon@b308.teamon.com> URL: https://gitlist.dev/e/15643506.1204491509692.JavaMail.teamon%40b308.teamon.com In-Reply-To: <1204491531-29758-2-git-send-email-drafnel@gmail.com> ``` Signed-off-by: Brandon Casey --- Documentation/git-reflog.txt | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt index 5719039..047e3ce 100644 --- a/Documentation/git-reflog.txt +++ b/Documentation/git-reflog.txt @@ -80,6 +80,15 @@ them. --all:: Instead of listing explicitly, prune all refs. +--updateref:: + Update the ref with the sha1 of the top reflog entry (i.e. + @\{0\}) after expiring or deleting. + +--rewrite:: + While expiring or deleting, adjust each reflog entry to ensure + that the `old` sha1 field points to the `new` sha1 field of the + previous entry. + --verbose:: Print extra information on screen. -- 1.5.4.3.412.gcd100 ``` ## drafnel@gmail.com, 2008-03-02 20:58 Subject: [PATCH 4/4] t3903-stash.sh: Add tests for new stash commands drop and pop Message-ID: <4655498.1204491512711.JavaMail.teamon@b308.teamon.com> URL: https://gitlist.dev/e/4655498.1204491512711.JavaMail.teamon%40b308.teamon.com In-Reply-To: <1204491531-29758-3-git-send-email-drafnel@gmail.com> ``` Signed-off-by: Brandon Casey --- t/t3903-stash.sh | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 45 insertions(+), 1 deletions(-) diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 2418f47..90a68a1 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -70,7 +70,51 @@ test_expect_success 'unstashing in a subdirectory' ' git reset --hard HEAD && mkdir subdir && cd subdir && - git stash apply + git stash apply && + cd .. +' + +test_expect_success 'drop top stash' ' + git reset --hard && + git stash list > stashlist1 && + echo 7 > file && + git stash && + git stash drop && + git stash list > stashlist2 && + diff stashlist1 stashlist2 && + git stash apply && + test 3 = $(cat file) && + test 1 = $(git show :file) && + test 1 = $(git show HEAD:file) +' + +test_expect_success 'drop middle stash' ' + git reset --hard && + echo 8 > file && + git stash && + echo 9 > file && + git stash && + git stash drop stash@{1} && + test 2 = $(git stash list | wc -l) && + git stash apply && + test 9 = $(cat file) && + test 1 = $(git show :file) && + test 1 = $(git show HEAD:file) && + git reset --hard && + git stash drop && + git stash apply && + test 3 = $(cat file) && + test 1 = $(git show :file) && + test 1 = $(git show HEAD:file) +' + +test_expect_success 'stash pop' ' + git reset --hard && + git stash pop && + test 3 = $(cat file) && + test 1 = $(git show :file) && + test 1 = $(git show HEAD:file) && + test 0 = $(git stash list | wc -l) ' test_done -- 1.5.4.3.412.gcd100 ```