diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-25T23·06+0100 |
commit | 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e (patch) | |
tree | 85730c182a9f5f492ade8e8ccdb1c2356f9900bd /third_party/git/t/t7815-grep-binary.sh | |
parent | 6f8fbf4aa4b1654ab27d4829e114538761817de0 (diff) |
revert(3p/git): Revert merge of git upstream at v2.26.2 r/852
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
Diffstat (limited to 'third_party/git/t/t7815-grep-binary.sh')
-rwxr-xr-x | third_party/git/t/t7815-grep-binary.sh | 148 |
1 files changed, 0 insertions, 148 deletions
diff --git a/third_party/git/t/t7815-grep-binary.sh b/third_party/git/t/t7815-grep-binary.sh deleted file mode 100755 index 90ebb64f46eb..000000000000 --- a/third_party/git/t/t7815-grep-binary.sh +++ /dev/null @@ -1,148 +0,0 @@ -#!/bin/sh - -test_description='git grep in binary files' - -. ./test-lib.sh - -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 -' - -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 |