kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t7407: use test_grep 

There are a few grep calls here that can benefit from test_grep, which
produces more user-friendly output when it fails.

One of these calls also passes "-sq", which is curious. The "-q" option
suppresses the matched output. But test output is either already
redirected to /dev/null in non-verbose mode, and in verbose mode it's
better to see the output. The "-s" option suppresses errors opening
files, but we are just grepping in the "expected" file we just
generated, so it should not be needed. Neither of these was really
hurting anything, but they are not a style we'd like to see emulated. So
get rid of them.

(It is also curious to grep in the expected file in the first place, but
that is because we are auto-generating the expectation from a Git
command. So this is double-checking it did what we wanted).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2025-01-07 02:18:24 -05:00 committed by Junio C Hamano
parent 4f71522dfb
commit ddb5287894
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t7407-submodule-foreach.sh
View File

@ -426,14 +426,14 @@ test_expect_success 'option-like arguments passed to foreach commands are not lo
git submodule foreach "echo be --quiet" > ../expected && git submodule foreach "echo be --quiet" > ../expected &&
git submodule foreach echo be --quiet > ../actual git submodule foreach echo be --quiet > ../actual
) && ) &&
grep -sq -e "--quiet" expected && test_grep -e "--quiet" expected &&
test_cmp expected actual test_cmp expected actual
' '


test_expect_success 'option-like arguments passed to foreach recurse correctly' ' test_expect_success 'option-like arguments passed to foreach recurse correctly' '
git -C clone2 submodule foreach --recursive "echo be --an-option" >expect && git -C clone2 submodule foreach --recursive "echo be --an-option" >expect &&
git -C clone2 submodule foreach --recursive echo be --an-option >actual && git -C clone2 submodule foreach --recursive echo be --an-option >actual &&
grep -e "--an-option" expect && test_grep -e "--an-option" expect &&
test_cmp expect actual test_cmp expect actual
' '