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/t4140-apply-ita.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/t4140-apply-ita.sh')
-rwxr-xr-x | third_party/git/t/t4140-apply-ita.sh | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/third_party/git/t/t4140-apply-ita.sh b/third_party/git/t/t4140-apply-ita.sh deleted file mode 100755 index c614eaf04cca..000000000000 --- a/third_party/git/t/t4140-apply-ita.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -test_description='git apply of i-t-a file' - -. ./test-lib.sh - -test_expect_success setup ' - test_write_lines 1 2 3 4 5 >blueprint && - - cat blueprint >test-file && - git add -N test-file && - git diff >creation-patch && - grep "new file mode 100644" creation-patch && - - rm -f test-file && - git diff >deletion-patch && - grep "deleted file mode 100644" deletion-patch -' - -test_expect_success 'apply creation patch to ita path (--cached)' ' - git rm -f test-file && - cat blueprint >test-file && - git add -N test-file && - - git apply --cached creation-patch && - git cat-file blob :test-file >actual && - test_cmp blueprint actual -' - -test_expect_success 'apply creation patch to ita path (--index)' ' - git rm -f test-file && - cat blueprint >test-file && - git add -N test-file && - rm -f test-file && - - test_must_fail git apply --index creation-patch -' - -test_expect_success 'apply deletion patch to ita path (--cached)' ' - git rm -f test-file && - cat blueprint >test-file && - git add -N test-file && - - git apply --cached deletion-patch && - test_must_fail git ls-files --stage --error-unmatch test-file -' - -test_expect_success 'apply deletion patch to ita path (--index)' ' - cat blueprint >test-file && - git add -N test-file && - - test_must_fail git apply --index deletion-patch && - git ls-files --stage --error-unmatch test-file -' - -test_done |