t7502: use diff.noprefix for --verbose test
authorJeff King <peff@peff.net>
Tue, 3 Oct 2017 13:43:47 +0000 (09:43 -0400)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Oct 2017 02:32:56 +0000 (11:32 +0900)
To check that "status -v" respects diff config, we set
"color.diff" and look at the output of "status". We could
equally well use any diff config. Since color output depends
on a lot of other factors (like whether stdout is a tty, and
how we interpret "always"), let's use a more mundane option.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7502-commit.sh
index 725687d5d5f26d6535b3f26d1fa221a8c567d57c..d33a3cb331b6c022343aff0bb7091cf8219b40df 100755 (executable)
@@ -171,9 +171,9 @@ test_expect_success 'verbose' '
 
 test_expect_success 'verbose respects diff config' '
 
-       test_config color.diff always &&
+       test_config diff.noprefix true &&
        git status -v >actual &&
-       grep "\[1mdiff --git" actual
+       grep "diff --git negative negative" actual
 '
 
 mesg_with_comment_and_newlines='