2010-05-22 21:26:39 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='git grep in binary files'
|
|
|
|
|
2021-11-16 18:27:38 +00:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2010-05-22 21:26:39 +00:00
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
test_expect_success 'setup' "
|
2017-05-20 21:42:16 +00:00
|
|
|
echo 'binaryQfileQm[*]cQ*æQð' | q_to_nul >a &&
|
2010-05-22 21:26:39 +00:00
|
|
|
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' '
|
|
|
|
test_must_fail git grep -I ina a >actual &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual
|
2010-05-22 21:26:39 +00:00
|
|
|
'
|
|
|
|
|
2010-05-22 21:29:35 +00:00
|
|
|
test_expect_success 'git grep -c ina a' '
|
|
|
|
echo a:1 >expect &&
|
|
|
|
git grep -c ina a >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2010-05-22 21:30:48 +00:00
|
|
|
test_expect_success 'git grep -l ina a' '
|
|
|
|
echo a >expect &&
|
|
|
|
git grep -l ina a >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2010-05-22 21:26:39 +00:00
|
|
|
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' '
|
|
|
|
git grep -q ina a >actual &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual
|
2010-05-22 21:26:39 +00:00
|
|
|
'
|
|
|
|
|
2010-05-22 21:32:43 +00:00
|
|
|
test_expect_success 'git grep -F ile a' '
|
|
|
|
git grep -F ile a
|
|
|
|
'
|
|
|
|
|
2010-05-22 21:34:06 +00:00
|
|
|
test_expect_success 'git grep -Fi iLE a' '
|
|
|
|
git grep -Fi iLE a
|
|
|
|
'
|
|
|
|
|
2010-05-22 21:35:07 +00:00
|
|
|
# This test actually passes on platforms where regexec() supports the
|
|
|
|
# flag REG_STARTEND.
|
2010-08-17 09:24:41 +00:00
|
|
|
test_expect_success 'git grep ile a' '
|
2010-05-22 21:35:07 +00:00
|
|
|
git grep ile a
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_failure 'git grep .fi a' '
|
|
|
|
git grep .fi a
|
|
|
|
'
|
|
|
|
|
2012-02-02 08:21:02 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2012-10-12 10:49:38 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2012-02-02 08:21:02 +00:00
|
|
|
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 &&
|
2016-02-17 08:57:46 +00:00
|
|
|
git grep bin b >actual.raw &&
|
|
|
|
nul_to_q <actual.raw >actual &&
|
2012-02-02 08:21:02 +00:00
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2013-05-10 15:10:14 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2013-05-10 15:10:15 +00:00
|
|
|
test_expect_success 'grep --textconv honors textconv' '
|
2017-05-20 21:42:16 +00:00
|
|
|
echo "a:binaryQfileQm[*]cQ*æQð" >expect &&
|
2013-05-10 15:10:14 +00:00
|
|
|
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
|
|
|
|
'
|
|
|
|
|
2013-05-10 15:10:16 +00:00
|
|
|
test_expect_success 'grep --textconv blob honors textconv' '
|
2017-05-20 21:42:16 +00:00
|
|
|
echo "HEAD:a:binaryQfileQm[*]cQ*æQð" >expect &&
|
2013-05-10 15:10:14 +00:00
|
|
|
git grep --textconv Qfile HEAD:a >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2010-05-22 21:26:39 +00:00
|
|
|
test_done
|