t7508: test git status -v

"status -v" had no test. Include one.

This also requires changing the .gitignore subtests, which is a good thing:
they include testing a .gitignore pattern now.

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael J Gruber 2015-03-06 10:43:34 +01:00 committed by Junio C Hamano
parent ec8a896eb5
commit f8c65c1f97

View File

@ -137,6 +137,12 @@ test_expect_success 'status with status.displayCommentPrefix=false' '
test_i18ncmp expect output test_i18ncmp expect output
' '
test_expect_success 'status -v' '
(cat expect && git diff --cached) >expect-with-v &&
git status -v >output &&
test_i18ncmp expect-with-v output
'
test_expect_success 'setup fake editor' ' test_expect_success 'setup fake editor' '
cat >.git/editor <<-\EOF && cat >.git/editor <<-\EOF &&
#! /bin/sh #! /bin/sh
@ -201,7 +207,7 @@ test_expect_success 'status -s' '
test_expect_success 'status with gitignore' ' test_expect_success 'status with gitignore' '
{ {
echo ".gitignore" && echo ".gitignore" &&
echo "expect" && echo "expect*" &&
echo "output" && echo "output" &&
echo "untracked" echo "untracked"
} >.gitignore && } >.gitignore &&
@ -222,6 +228,7 @@ test_expect_success 'status with gitignore' '
!! dir1/untracked !! dir1/untracked
!! dir2/untracked !! dir2/untracked
!! expect !! expect
!! expect-with-v
!! output !! output
!! untracked !! untracked
EOF EOF
@ -253,6 +260,7 @@ Ignored files:
dir1/untracked dir1/untracked
dir2/untracked dir2/untracked
expect expect
expect-with-v
output output
untracked untracked
@ -264,7 +272,7 @@ EOF
test_expect_success 'status with gitignore (nothing untracked)' ' test_expect_success 'status with gitignore (nothing untracked)' '
{ {
echo ".gitignore" && echo ".gitignore" &&
echo "expect" && echo "expect*" &&
echo "dir2/modified" && echo "dir2/modified" &&
echo "output" && echo "output" &&
echo "untracked" echo "untracked"
@ -285,6 +293,7 @@ test_expect_success 'status with gitignore (nothing untracked)' '
!! dir2/modified !! dir2/modified
!! dir2/untracked !! dir2/untracked
!! expect !! expect
!! expect-with-v
!! output !! output
!! untracked !! untracked
EOF EOF
@ -312,6 +321,7 @@ Ignored files:
dir2/modified dir2/modified
dir2/untracked dir2/untracked
expect expect
expect-with-v
output output
untracked untracked