From: Jon Seymour Date: Tue, 03 Aug 2010 10:36:15 GMT Subject: [PATCH v2 3/3] stash: modify tests to reflect stash branch fixes. Message-ID: <1280831775-30759-4-git-send-email-jon.seymour@gmail.com> In-Reply-To: <1280831775-30759-1-git-send-email-jon.seymour@gmail.com> These tests now pass so they are now updated to reflect this. Signed-off-by: Jon Seymour --- t/t3903-stash.sh | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 4d8b6ad..e5f248e 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -378,7 +378,7 @@ test_expect_failure 'stash file to directory' ' test foo = "$(cat file/file)" ' -test_expect_failure 'stash branch from arbitrary stash ref when there are no stash references' ' +test_expect_success 'stash branch with no stashes on stack and stash-like reference as argument' ' git stash clear && test_when_finished "git reset --hard HEAD" && git reset --hard && @@ -391,10 +391,8 @@ test_expect_failure 'stash branch from arbitrary stash ref when there are no sta test $(git ls-files --modified | wc -l) -eq 1 ' -test_expect_failure 'stash branch from arbitrary stash ref fails even if there is a stash' ' - git stash clear && { - git branch -D stash-branch || true - } +test_expect_success 'stash branch with stashes on stack and stash-like reference as argument' ' + git stash clear && test_when_finished "git reset --hard HEAD" && git reset --hard && echo foo >> file && -- 1.7.2.1.111.g8fc90