{"thread":{"id":"12435","subject":"[PATCH 2/4] t3903-stash.sh: use test_must_fail instead of '!' notation","startedAt":"2008-03-02T20:58:49Z","lastAt":"2008-03-02T20:58:51Z","messageCount":3,"participants":["drafnel@gmail.com"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"70695","messageId":"5952365.1204491506490.JavaMail.teamon@b308.teamon.com","threadId":"12435","inReplyTo":"1204491531-29758-1-git-send-email-drafnel@gmail.com","subject":"[PATCH 2/4] t3903-stash.sh: use test_must_fail instead of '!' notation","fromName":"","fromEmail":"drafnel@gmail.com","sentAt":"2008-03-02T20:58:49Z","receivedAt":"2008-03-02T20:58:49Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"Signed-off-by: Brandon Casey <drafnel@gmail.com>\n---\n t/t3903-stash.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/t/t3903-stash.sh b/t/t3903-stash.sh\nindex 50a2c83..2418f47 100755\n--- a/t/t3903-stash.sh\n+++ b/t/t3903-stash.sh\n@@ -41,7 +41,7 @@ test_expect_success 'apply needs clean working directory' '\n \techo 4 > other-file &&\n \tgit add other-file &&\n \techo 5 > other-file &&\n-\t! git stash apply\n+\ttest_must_fail git stash apply\n '\n \n test_expect_success 'apply stashed changes' '\n-- \n1.5.4.3.412.gcd100\n\n"},{"id":"70698","messageId":"15643506.1204491509692.JavaMail.teamon@b308.teamon.com","threadId":"12435","inReplyTo":"1204491531-29758-2-git-send-email-drafnel@gmail.com","subject":"[PATCH 3/4] git-reflog.txt: Document new commands --updateref and --rewrite","fromName":"","fromEmail":"drafnel@gmail.com","sentAt":"2008-03-02T20:58:50Z","receivedAt":"2008-03-02T20:58:50Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"Signed-off-by: Brandon Casey <drafnel@gmail.com>\n---\n Documentation/git-reflog.txt |    9 +++++++++\n 1 files changed, 9 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt\nindex 5719039..047e3ce 100644\n--- a/Documentation/git-reflog.txt\n+++ b/Documentation/git-reflog.txt\n@@ -80,6 +80,15 @@ them.\n --all::\n \tInstead of listing <refs> explicitly, prune all refs.\n \n+--updateref::\n+\tUpdate the ref with the sha1 of the top reflog entry (i.e.\n+\t<ref>@\\{0\\}) after expiring or deleting.\n+\n+--rewrite::\n+\tWhile expiring or deleting, adjust each reflog entry to ensure\n+\tthat the `old` sha1 field points to the `new` sha1 field of the\n+\tprevious entry.\n+\n --verbose::\n \tPrint extra information on screen.\n \n-- \n1.5.4.3.412.gcd100\n\n"},{"id":"70697","messageId":"4655498.1204491512711.JavaMail.teamon@b308.teamon.com","threadId":"12435","inReplyTo":"1204491531-29758-3-git-send-email-drafnel@gmail.com","subject":"[PATCH 4/4] t3903-stash.sh: Add tests for new stash commands drop and pop","fromName":"","fromEmail":"drafnel@gmail.com","sentAt":"2008-03-02T20:58:51Z","receivedAt":"2008-03-02T20:58:51Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"Signed-off-by: Brandon Casey <drafnel@gmail.com>\n---\n t/t3903-stash.sh |   46 +++++++++++++++++++++++++++++++++++++++++++++-\n 1 files changed, 45 insertions(+), 1 deletions(-)\n\ndiff --git a/t/t3903-stash.sh b/t/t3903-stash.sh\nindex 2418f47..90a68a1 100755\n--- a/t/t3903-stash.sh\n+++ b/t/t3903-stash.sh\n@@ -70,7 +70,51 @@ test_expect_success 'unstashing in a subdirectory' '\n \tgit reset --hard HEAD &&\n \tmkdir subdir &&\n \tcd subdir &&\n-\tgit stash apply\n+\tgit stash apply &&\n+\tcd ..\n+'\n+\n+test_expect_success 'drop top stash' '\n+\tgit reset --hard &&\n+\tgit stash list > stashlist1 &&\n+\techo 7 > file &&\n+\tgit stash &&\n+\tgit stash drop &&\n+\tgit stash list > stashlist2 &&\n+\tdiff stashlist1 stashlist2 &&\n+\tgit stash apply &&\n+\ttest 3 = $(cat file) &&\n+\ttest 1 = $(git show :file) &&\n+\ttest 1 = $(git show HEAD:file)\n+'\n+\n+test_expect_success 'drop middle stash' '\n+\tgit reset --hard &&\n+\techo 8 > file &&\n+\tgit stash &&\n+\techo 9 > file &&\n+\tgit stash &&\n+\tgit stash drop stash@{1} &&\n+\ttest 2 = $(git stash list | wc -l) &&\n+\tgit stash apply &&\n+\ttest 9 = $(cat file) &&\n+\ttest 1 = $(git show :file) &&\n+\ttest 1 = $(git show HEAD:file) &&\n+\tgit reset --hard &&\n+\tgit stash drop &&\n+\tgit stash apply &&\n+\ttest 3 = $(cat file) &&\n+\ttest 1 = $(git show :file) &&\n+\ttest 1 = $(git show HEAD:file)\n+'\n+\n+test_expect_success 'stash pop' '\n+\tgit reset --hard &&\n+\tgit stash pop &&\n+\ttest 3 = $(cat file) &&\n+\ttest 1 = $(git show :file) &&\n+\ttest 1 = $(git show HEAD:file) &&\n+\ttest 0 = $(git stash list | wc -l)\n '\n \n test_done\n-- \n1.5.4.3.412.gcd100\n\n"}]}