diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/t/t7815-grep-binary.sh | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
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 |