aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-03-11 14:25:04 -0700
committerJunio C Hamano <gitster@pobox.com>2025-03-12 08:48:54 -0700
commitb0db79892891810249702474e5bd3ca19b8fc558 (patch)
treeaffb23098b4af198c2df8f2d5b5a7ae2d93fe256
parentt6120: avoid hiding "git" exit status (diff)
downloadgit-b0db79892891810249702474e5bd3ca19b8fc558.tar.gz
git-b0db79892891810249702474e5bd3ca19b8fc558.zip
t6120: further modernize
There is absolutely no reason why a pattern given to grep to find 'warning: --stdin is deprecated' must be quoted within a pair of single quotes, or the pattern to look for the literal string as ERE. Quote the test body with a pair of single quotes like everybody else, and quote the needle string in a pair of double quotes. Also use test_grep instead of "grep -E". Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t6120-describe.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index dcb526e37d..71e261394a 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -298,11 +298,11 @@ test_expect_success 'name-rev --annotate-stdin' '
test_cmp expect actual
'
-test_expect_success 'name-rev --stdin deprecated' "
+test_expect_success 'name-rev --stdin deprecated' '
git rev-list --all >list &&
git name-rev --stdin <list 2>actual &&
- grep -E 'warning: --stdin is deprecated' actual
-"
+ test_grep "warning: --stdin is deprecated" actual
+'
test_expect_success 'describe --contains with the exact tags' '
echo "A^0" >expect &&