summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-10-03 09:43:47 -0400
committerJunio C Hamano <gitster@pobox.com>2017-10-04 11:32:56 +0900
commit0fcf760e3cc336d28e0ab30e829ea33d37b3ae37 (patch)
treeba5e750fb5e4f509dfaa95588f4e4a7ef31c4cd1
parent01c94e9001d5e78be32c64728058428fdb2febb4 (diff)
downloadgit-0fcf760e3cc336d28e0ab30e829ea33d37b3ae37.tar.gz
t7502: use diff.noprefix for --verbose test
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>
-rwxr-xr-xt/t7502-commit.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh
index 725687d5d5..d33a3cb331 100755
--- a/t/t7502-commit.sh
+++ b/t/t7502-commit.sh
@@ -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='