revert(3p/git): Revert merge of git upstream at v2.26.2
This causes cgit to serve error pages, which is undesirable. This reverts commit5229c9b232, reversing changes made tof2b211131f.
This commit is contained in:
Vincent Ambo
parent
6f8fbf4aa4
commit
93ba78d6f4
1006 changed files with 60537 additions and 148724 deletions
249
third_party/git/t/t7008-grep-binary.sh
vendored
Executable file
249
third_party/git/t/t7008-grep-binary.sh
vendored
Executable file
|
|
@ -0,0 +1,249 @@
|
|||
#!/bin/sh
|
||||
|
||||
test_description='git grep in binary files'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
nul_match () {
|
||||
matches=$1
|
||||
flags=$2
|
||||
pattern=$3
|
||||
pattern_human=$(echo "$pattern" | sed 's/Q/<NUL>/g')
|
||||
|
||||
if test "$matches" = 1
|
||||
then
|
||||
test_expect_success "git grep -f f $flags '$pattern_human' a" "
|
||||
printf '$pattern' | q_to_nul >f &&
|
||||
git grep -f f $flags a
|
||||
"
|
||||
elif test "$matches" = 0
|
||||
then
|
||||
test_expect_success "git grep -f f $flags '$pattern_human' a" "
|
||||
printf '$pattern' | q_to_nul >f &&
|
||||
test_must_fail git grep -f f $flags a
|
||||
"
|
||||
elif test "$matches" = T1
|
||||
then
|
||||
test_expect_failure "git grep -f f $flags '$pattern_human' a" "
|
||||
printf '$pattern' | q_to_nul >f &&
|
||||
git grep -f f $flags a
|
||||
"
|
||||
elif test "$matches" = T0
|
||||
then
|
||||
test_expect_failure "git grep -f f $flags '$pattern_human' a" "
|
||||
printf '$pattern' | q_to_nul >f &&
|
||||
test_must_fail git grep -f f $flags a
|
||||
"
|
||||
else
|
||||
test_expect_success "PANIC: Test framework error. Unknown matches value $matches" 'false'
|
||||
fi
|
||||
}
|
||||
|
||||
test_expect_success 'setup' "
|
||||
echo 'binaryQfileQm[*]cQ*æQð' | 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' '
|
||||
test_must_fail git grep -I ina a >actual &&
|
||||
test_must_be_empty 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' '
|
||||
git grep -q ina a >actual &&
|
||||
test_must_be_empty 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
|
||||
'
|
||||
|
||||
nul_match 1 '-F' 'yQf'
|
||||
nul_match 0 '-F' 'yQx'
|
||||
nul_match 1 '-Fi' 'YQf'
|
||||
nul_match 0 '-Fi' 'YQx'
|
||||
nul_match 1 '' 'yQf'
|
||||
nul_match 0 '' 'yQx'
|
||||
nul_match 1 '' 'æQð'
|
||||
nul_match 1 '-F' 'eQm[*]c'
|
||||
nul_match 1 '-Fi' 'EQM[*]C'
|
||||
|
||||
# Regex patterns that would match but shouldn't with -F
|
||||
nul_match 0 '-F' 'yQ[f]'
|
||||
nul_match 0 '-F' '[y]Qf'
|
||||
nul_match 0 '-Fi' 'YQ[F]'
|
||||
nul_match 0 '-Fi' '[Y]QF'
|
||||
nul_match 0 '-F' 'æQ[ð]'
|
||||
nul_match 0 '-F' '[æ]Qð'
|
||||
nul_match 0 '-Fi' 'ÆQ[Ð]'
|
||||
nul_match 0 '-Fi' '[Æ]QÐ'
|
||||
|
||||
# kwset is disabled on -i & non-ASCII. No way to match non-ASCII \0
|
||||
# patterns case-insensitively.
|
||||
nul_match T1 '-i' 'ÆQÐ'
|
||||
|
||||
# \0 implicitly disables regexes. This is an undocumented internal
|
||||
# limitation.
|
||||
nul_match T1 '' 'yQ[f]'
|
||||
nul_match T1 '' '[y]Qf'
|
||||
nul_match T1 '-i' 'YQ[F]'
|
||||
nul_match T1 '-i' '[Y]Qf'
|
||||
nul_match T1 '' 'æQ[ð]'
|
||||
nul_match T1 '' '[æ]Qð'
|
||||
nul_match T1 '-i' 'ÆQ[Ð]'
|
||||
|
||||
# ... because of \0 implicitly disabling regexes regexes that
|
||||
# should/shouldn't match don't do the right thing.
|
||||
nul_match T1 '' 'eQm.*cQ'
|
||||
nul_match T1 '-i' 'EQM.*cQ'
|
||||
nul_match T0 '' 'eQm[*]c'
|
||||
nul_match T0 '-i' 'EQM[*]C'
|
||||
|
||||
# Due to the REG_STARTEND extension when kwset() is disabled on -i &
|
||||
# non-ASCII the string will be matched in its entirety, but the
|
||||
# pattern will be cut off at the first \0.
|
||||
nul_match 0 '-i' 'NOMATCHQð'
|
||||
nul_match T0 '-i' '[Æ]QNOMATCH'
|
||||
nul_match T0 '-i' '[æ]QNOMATCH'
|
||||
# Matches, but for the wrong reasons, just stops at [æ]
|
||||
nul_match 1 '-i' '[Æ]Qð'
|
||||
nul_match 1 '-i' '[æ]Qð'
|
||||
|
||||
# Ensure that the matcher doesn't regress to something that stops at
|
||||
# \0
|
||||
nul_match 0 '-F' 'yQ[f]'
|
||||
nul_match 0 '-Fi' 'YQ[F]'
|
||||
nul_match 0 '' 'yQNOMATCH'
|
||||
nul_match 0 '' 'QNOMATCH'
|
||||
nul_match 0 '-i' 'YQNOMATCH'
|
||||
nul_match 0 '-i' 'QNOMATCH'
|
||||
nul_match 0 '-F' 'æQ[ð]'
|
||||
nul_match 0 '-Fi' 'ÆQ[Ð]'
|
||||
nul_match 0 '' 'yQNÓMATCH'
|
||||
nul_match 0 '' 'QNÓMATCH'
|
||||
nul_match 0 '-i' 'YQNÓMATCH'
|
||||
nul_match 0 '-i' 'QNÓMATCH'
|
||||
|
||||
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:binaryQfileQm[*]cQ*æQð" >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:binaryQfileQm[*]cQ*æQð" >expect &&
|
||||
git grep --textconv Qfile HEAD:a >actual &&
|
||||
test_cmp expect actual
|
||||
'
|
||||
|
||||
test_done
|
||||
Loading…
Add table
Add a link
Reference in a new issue