aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-06 14:54:03 -0800
committerJunio C Hamano <gitster@pobox.com>2018-03-06 14:54:03 -0800
commit44f2f3f919353f4732910b6e0f10d5aae90bd5b7 (patch)
treebd5ac936a09ae0d96fc8dbe335f62840b399a1ff
parentMerge branch 'sb/color-h-cleanup' (diff)
parentt6300-for-each-ref: fix "more than one quoting style" tests (diff)
downloadgit-44f2f3f919353f4732910b6e0f10d5aae90bd5b7.tar.gz
git-44f2f3f919353f4732910b6e0f10d5aae90bd5b7.zip
Merge branch 'sg/t6300-modernize'
Test update. * sg/t6300-modernize: t6300-for-each-ref: fix "more than one quoting style" tests
-rwxr-xr-xt/t6300-for-each-ref.sh7
1 files changed, 2 insertions, 5 deletions
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index c128dfc579..295d1475bd 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -373,11 +373,8 @@ test_expect_success 'Quoting style: tcl' '
for i in "--perl --shell" "-s --python" "--python --tcl" "--tcl --perl"; do
test_expect_success "more than one quoting style: $i" "
- git for-each-ref $i 2>&1 | (read line &&
- case \$line in
- \"error: more than one quoting style\"*) : happy;;
- *) false
- esac)
+ test_must_fail git for-each-ref $i 2>err &&
+ grep '^error: more than one quoting style' err
"
done