Skip to content

Commit

Permalink
t3903-stash.sh: Add tests for new stash commands drop and pop
Browse files Browse the repository at this point in the history
Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Brandon Casey authored and Junio C Hamano committed Mar 3, 2008
1 parent cf2756a commit b683c08
Showing 1 changed file with 45 additions and 1 deletion.
46 changes: 45 additions & 1 deletion t/t3903-stash.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit b683c08

Please sign in to comment.