mirror of
https://github.com/git/git.git
synced 2024-11-01 14:57:52 +01:00
a0578e0382
Git should not be on the left-hand side of a pipe, because it hides the exit code, and we want to make sure git does not fail. Fix all invocations of 'nul_to_q' (defined in /t/test-lib-functions.sh) using this pattern. There is one more occurrence of the pattern in t9010-svn-fe.sh which is too evolved to change it easily. All remaining test code that does not adhere to the pattern can be found with the following command: git grep -E 'git.*[^|]\|($|[^|])' Helped-by: Jeff King <peff@peff.net> Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
180 lines
4 KiB
Bash
Executable file
180 lines
4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='git grep in binary files'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' "
|
|
echo 'binaryQfile' | q_to_nul >a &&
|
|
git add a &&
|
|
git commit -m.
|
|
"
|
|
|
|
test_expect_success 'git grep ina a' '
|
|
echo Binary file a matches >expect &&
|
|
git grep ina a >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git grep -ah ina a' '
|
|
git grep -ah ina a >actual &&
|
|
test_cmp a actual
|
|
'
|
|
|
|
test_expect_success 'git grep -I ina a' '
|
|
: >expect &&
|
|
test_must_fail git grep -I ina a >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git grep -c ina a' '
|
|
echo a:1 >expect &&
|
|
git grep -c ina a >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git grep -l ina a' '
|
|
echo a >expect &&
|
|
git grep -l ina a >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git grep -L bar a' '
|
|
echo a >expect &&
|
|
git grep -L bar a >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git grep -q ina a' '
|
|
: >expect &&
|
|
git grep -q ina a >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'git grep -F ile a' '
|
|
git grep -F ile a
|
|
'
|
|
|
|
test_expect_success 'git grep -Fi iLE a' '
|
|
git grep -Fi iLE a
|
|
'
|
|
|
|
# This test actually passes on platforms where regexec() supports the
|
|
# flag REG_STARTEND.
|
|
test_expect_success 'git grep ile a' '
|
|
git grep ile a
|
|
'
|
|
|
|
test_expect_failure 'git grep .fi a' '
|
|
git grep .fi a
|
|
'
|
|
|
|
test_expect_success 'git grep -F y<NUL>f a' "
|
|
printf 'yQf' | q_to_nul >f &&
|
|
git grep -f f -F a
|
|
"
|
|
|
|
test_expect_success 'git grep -F y<NUL>x a' "
|
|
printf 'yQx' | q_to_nul >f &&
|
|
test_must_fail git grep -f f -F a
|
|
"
|
|
|
|
test_expect_success 'git grep -Fi Y<NUL>f a' "
|
|
printf 'YQf' | q_to_nul >f &&
|
|
git grep -f f -Fi a
|
|
"
|
|
|
|
test_expect_success 'git grep -Fi Y<NUL>x a' "
|
|
printf 'YQx' | q_to_nul >f &&
|
|
test_must_fail git grep -f f -Fi a
|
|
"
|
|
|
|
test_expect_success 'git grep y<NUL>f a' "
|
|
printf 'yQf' | q_to_nul >f &&
|
|
git grep -f f a
|
|
"
|
|
|
|
test_expect_success 'git grep y<NUL>x a' "
|
|
printf 'yQx' | q_to_nul >f &&
|
|
test_must_fail git grep -f f a
|
|
"
|
|
|
|
test_expect_success 'grep respects binary diff attribute' '
|
|
echo text >t &&
|
|
git add t &&
|
|
echo t:text >expect &&
|
|
git grep text t >actual &&
|
|
test_cmp expect actual &&
|
|
echo "t -diff" >.gitattributes &&
|
|
echo "Binary file t matches" >expect &&
|
|
git grep text t >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'grep --cached respects binary diff attribute' '
|
|
git grep --cached text t >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'grep --cached respects binary diff attribute (2)' '
|
|
git add .gitattributes &&
|
|
rm .gitattributes &&
|
|
git grep --cached text t >actual &&
|
|
test_when_finished "git rm --cached .gitattributes" &&
|
|
test_when_finished "git checkout .gitattributes" &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'grep revision respects binary diff attribute' '
|
|
git commit -m new &&
|
|
echo "Binary file HEAD:t matches" >expect &&
|
|
git grep text HEAD -- t >actual &&
|
|
test_when_finished "git reset HEAD^" &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'grep respects not-binary diff attribute' '
|
|
echo binQary | q_to_nul >b &&
|
|
git add b &&
|
|
echo "Binary file b matches" >expect &&
|
|
git grep bin b >actual &&
|
|
test_cmp expect actual &&
|
|
echo "b diff" >.gitattributes &&
|
|
echo "b:binQary" >expect &&
|
|
git grep bin b >actual.raw &&
|
|
nul_to_q <actual.raw >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >nul_to_q_textconv <<'EOF'
|
|
#!/bin/sh
|
|
"$PERL_PATH" -pe 'y/\000/Q/' < "$1"
|
|
EOF
|
|
chmod +x nul_to_q_textconv
|
|
|
|
test_expect_success 'setup textconv filters' '
|
|
echo a diff=foo >.gitattributes &&
|
|
git config diff.foo.textconv "\"$(pwd)\""/nul_to_q_textconv
|
|
'
|
|
|
|
test_expect_success 'grep does not honor textconv' '
|
|
test_must_fail git grep Qfile
|
|
'
|
|
|
|
test_expect_success 'grep --textconv honors textconv' '
|
|
echo "a:binaryQfile" >expect &&
|
|
git grep --textconv Qfile >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'grep --no-textconv does not honor textconv' '
|
|
test_must_fail git grep --no-textconv Qfile
|
|
'
|
|
|
|
test_expect_success 'grep --textconv blob honors textconv' '
|
|
echo "HEAD:a:binaryQfile" >expect &&
|
|
git grep --textconv Qfile HEAD:a >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|