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/t7606-merge-custom.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/t7606-merge-custom.sh')
-rwxr-xr-x | third_party/git/t/t7606-merge-custom.sh | 93 |
1 files changed, 0 insertions, 93 deletions
diff --git a/third_party/git/t/t7606-merge-custom.sh b/third_party/git/t/t7606-merge-custom.sh deleted file mode 100755 index 8e8c4d724640..000000000000 --- a/third_party/git/t/t7606-merge-custom.sh +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -test_description="git merge - -Testing a custom strategy. - -* (HEAD, master) Merge commit 'c3' -|\ -| * (tag: c3) c3 -* | (tag: c1) c1 -|/ -| * tag: c2) c2 -|/ -* (tag: c0) c0 -" - -. ./test-lib.sh - -test_expect_success 'set up custom strategy' ' - cat >git-merge-theirs <<-EOF && - #!$SHELL_PATH - eval git read-tree --reset -u \\\$\$# - EOF - - chmod +x git-merge-theirs && - PATH=.:$PATH && - export PATH -' - -test_expect_success 'setup' ' - test_commit c0 c0.c && - test_commit c1 c1.c && - git reset --keep c0 && - echo c1c1 >c1.c && - git add c1.c && - test_commit c2 c2.c && - git reset --keep c0 && - test_commit c3 c3.c -' - -test_expect_success 'merge c2 with a custom strategy' ' - git reset --hard c1 && - - git rev-parse c1 >head.old && - git rev-parse c2 >second-parent.expected && - git rev-parse c2^{tree} >tree.expected && - git merge -s theirs c2 && - - git rev-parse HEAD >head.new && - git rev-parse HEAD^1 >first-parent && - git rev-parse HEAD^2 >second-parent && - git rev-parse HEAD^{tree} >tree && - git update-index --refresh && - git diff --exit-code && - git diff --exit-code c2 HEAD && - git diff --exit-code c2 && - - ! test_cmp head.old head.new && - test_cmp head.old first-parent && - test_cmp second-parent.expected second-parent && - test_cmp tree.expected tree && - test -f c0.c && - grep c1c1 c1.c && - test -f c2.c -' - -test_expect_success 'trivial merge with custom strategy' ' - git reset --hard c1 && - - git rev-parse c1 >head.old && - git rev-parse c3 >second-parent.expected && - git rev-parse c3^{tree} >tree.expected && - git merge -s theirs c3 && - - git rev-parse HEAD >head.new && - git rev-parse HEAD^1 >first-parent && - git rev-parse HEAD^2 >second-parent && - git rev-parse HEAD^{tree} >tree && - git update-index --refresh && - git diff --exit-code && - git diff --exit-code c3 HEAD && - git diff --exit-code c3 && - - ! test_cmp head.old head.new && - test_cmp head.old first-parent && - test_cmp second-parent.expected second-parent && - test_cmp tree.expected tree && - test -f c0.c && - ! test -e c1.c && - test -f c3.c -' - -test_done |