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/t4128-apply-root.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/t4128-apply-root.sh')
-rwxr-xr-x | third_party/git/t/t4128-apply-root.sh | 112 |
1 files changed, 0 insertions, 112 deletions
diff --git a/third_party/git/t/t4128-apply-root.sh b/third_party/git/t/t4128-apply-root.sh deleted file mode 100755 index 6cc741a634b0..000000000000 --- a/third_party/git/t/t4128-apply-root.sh +++ /dev/null @@ -1,112 +0,0 @@ -#!/bin/sh - -test_description='apply same filename' - -. ./test-lib.sh - -test_expect_success 'setup' ' - - mkdir -p some/sub/dir && - echo Hello > some/sub/dir/file && - git add some/sub/dir/file && - git commit -m initial && - git tag initial - -' - -cat > patch << EOF -diff a/bla/blub/dir/file b/bla/blub/dir/file ---- a/bla/blub/dir/file -+++ b/bla/blub/dir/file -@@ -1,1 +1,1 @@ --Hello -+Bello -EOF - -test_expect_success 'apply --directory -p (1)' ' - - git apply --directory=some/sub -p3 --index patch && - test Bello = $(git show :some/sub/dir/file) && - test Bello = $(cat some/sub/dir/file) - -' - -test_expect_success 'apply --directory -p (2) ' ' - - git reset --hard initial && - git apply --directory=some/sub/ -p3 --index patch && - test Bello = $(git show :some/sub/dir/file) && - test Bello = $(cat some/sub/dir/file) - -' - -cat > patch << EOF -diff --git a/newfile b/newfile -new file mode 100644 -index 0000000..d95f3ad ---- /dev/null -+++ b/newfile -@@ -0,0 +1 @@ -+content -EOF - -test_expect_success 'apply --directory (new file)' ' - git reset --hard initial && - git apply --directory=some/sub/dir/ --index patch && - test content = $(git show :some/sub/dir/newfile) && - test content = $(cat some/sub/dir/newfile) -' - -cat > patch << EOF -diff --git a/c/newfile2 b/c/newfile2 -new file mode 100644 -index 0000000..d95f3ad ---- /dev/null -+++ b/c/newfile2 -@@ -0,0 +1 @@ -+content -EOF - -test_expect_success 'apply --directory -p (new file)' ' - git reset --hard initial && - git apply -p2 --directory=some/sub/dir/ --index patch && - test content = $(git show :some/sub/dir/newfile2) && - test content = $(cat some/sub/dir/newfile2) -' - -cat > patch << EOF -diff --git a/delfile b/delfile -deleted file mode 100644 -index d95f3ad..0000000 ---- a/delfile -+++ /dev/null -@@ -1 +0,0 @@ --content -EOF - -test_expect_success 'apply --directory (delete file)' ' - git reset --hard initial && - echo content >some/sub/dir/delfile && - git add some/sub/dir/delfile && - git apply --directory=some/sub/dir/ --index patch && - ! (git ls-files | grep delfile) -' - -cat > patch << 'EOF' -diff --git "a/qu\157tefile" "b/qu\157tefile" -new file mode 100644 -index 0000000..d95f3ad ---- /dev/null -+++ "b/qu\157tefile" -@@ -0,0 +1 @@ -+content -EOF - -test_expect_success 'apply --directory (quoted filename)' ' - git reset --hard initial && - git apply --directory=some/sub/dir/ --index patch && - test content = $(git show :some/sub/dir/quotefile) && - test content = $(cat some/sub/dir/quotefile) -' - -test_done |