From 488a05269f9bff153208cdd9300ad57947ee028f Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 9 Nov 2017 18:00:38 +0100 Subject: [PATCH] status: verify that --show-ignored-directory prints a warning The option is deprecated now, and we better make sure that keeps saying so until we finally remove it. Suggested by Kevin Willford. Signed-off-by: Johannes Schindelin --- t/t7522-status-show-ignored-directory.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/t7522-status-show-ignored-directory.sh b/t/t7522-status-show-ignored-directory.sh index 856c00e43f61ef..af29f8bb4fab72 100755 --- a/t/t7522-status-show-ignored-directory.sh +++ b/t/t7522-status-show-ignored-directory.sh @@ -21,6 +21,7 @@ test_expect_success 'setup initial commit and ignore file' ' ' cat >expect <<\EOF +? err ? expect ? output ! dir/ignored/ignored_1.ign @@ -38,8 +39,9 @@ test_expect_success 'setup folder with ignored files' ' test_expect_success 'Verify behavior of status on folders with ignored files' ' test_when_finished "git clean -fdx" && - git status --porcelain=v2 --ignored --untracked-files=all --show-ignored-directory >output && - test_i18ncmp expect output + git status --porcelain=v2 --ignored --untracked-files=all --show-ignored-directory >output 2>err && + test_i18ncmp expect output && + grep "deprecated.*use --ignored=matching instead" err ' # Test status bahavior on folder with tracked and ignored files