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/t4031-diff-rewrite-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/t4031-diff-rewrite-binary.sh')
-rwxr-xr-x | third_party/git/t/t4031-diff-rewrite-binary.sh | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/third_party/git/t/t4031-diff-rewrite-binary.sh b/third_party/git/t/t4031-diff-rewrite-binary.sh deleted file mode 100755 index eacc6694f785..000000000000 --- a/third_party/git/t/t4031-diff-rewrite-binary.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh - -test_description='rewrite diff on binary file' - -. ./test-lib.sh - -# We must be large enough to meet the MINIMUM_BREAK_SIZE -# requirement. -make_file() { - # common first line to help identify rewrite versus regular diff - printf "=\n" >file - for i in 1 2 3 4 5 6 7 8 9 10 - do - for j in 1 2 3 4 5 6 7 8 9 - do - for k in 1 2 3 4 5 - do - printf "$1\n" - done - done - done >>file -} - -test_expect_success 'create binary file with changes' ' - make_file "\\0" && - git add file && - make_file "\\01" -' - -test_expect_success 'vanilla diff is binary' ' - git diff >diff && - grep "Binary files a/file and b/file differ" diff -' - -test_expect_success 'rewrite diff is binary' ' - git diff -B >diff && - grep "dissimilarity index" diff && - grep "Binary files a/file and b/file differ" diff -' - -test_expect_success 'rewrite diff can show binary patch' ' - git diff -B --binary >diff && - grep "dissimilarity index" diff && - grep "GIT binary patch" diff -' - -test_expect_success 'rewrite diff --numstat shows binary changes' ' - git diff -B --numstat --summary >diff && - grep -e "- - " diff && - grep " rewrite file" diff -' - -test_expect_success 'diff --stat counts binary rewrite as 0 lines' ' - git diff -B --stat --summary >diff && - grep "Bin" diff && - test_i18ngrep "0 insertions.*0 deletions" diff && - grep " rewrite file" diff -' - -{ - echo "#!$SHELL_PATH" - cat <<'EOF' -"$PERL_PATH" -e '$/ = undef; $_ = <>; s/./ord($&)/ge; print $_' < "$1" -EOF -} >dump -chmod +x dump - -test_expect_success 'setup textconv' ' - echo file diff=foo >.gitattributes && - git config diff.foo.textconv "\"$(pwd)\""/dump -' - -test_expect_success 'rewrite diff respects textconv' ' - git diff -B >diff && - grep "dissimilarity index" diff && - grep "^-61" diff && - grep "^-0" diff -' - -test_done |