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/t2404-worktree-config.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/t2404-worktree-config.sh')
-rwxr-xr-x | third_party/git/t/t2404-worktree-config.sh | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/third_party/git/t/t2404-worktree-config.sh b/third_party/git/t/t2404-worktree-config.sh deleted file mode 100755 index 9536d1091954..000000000000 --- a/third_party/git/t/t2404-worktree-config.sh +++ /dev/null @@ -1,81 +0,0 @@ -#!/bin/sh - -test_description="config file in multi worktree" - -. ./test-lib.sh - -test_expect_success 'setup' ' - test_commit start -' - -test_expect_success 'config --worktree in single worktree' ' - git config --worktree foo.bar true && - test_cmp_config true foo.bar -' - -test_expect_success 'add worktrees' ' - git worktree add wt1 && - git worktree add wt2 -' - -test_expect_success 'config --worktree without extension' ' - test_must_fail git config --worktree foo.bar false -' - -test_expect_success 'enable worktreeConfig extension' ' - git config core.repositoryformatversion 1 && - git config extensions.worktreeConfig true && - test_cmp_config true extensions.worktreeConfig && - test_cmp_config 1 core.repositoryformatversion -' - -test_expect_success 'config is shared as before' ' - git config this.is shared && - test_cmp_config shared this.is && - test_cmp_config -C wt1 shared this.is && - test_cmp_config -C wt2 shared this.is -' - -test_expect_success 'config is shared (set from another worktree)' ' - git -C wt1 config that.is also-shared && - test_cmp_config also-shared that.is && - test_cmp_config -C wt1 also-shared that.is && - test_cmp_config -C wt2 also-shared that.is -' - -test_expect_success 'config private to main worktree' ' - git config --worktree this.is for-main && - test_cmp_config for-main this.is && - test_cmp_config -C wt1 shared this.is && - test_cmp_config -C wt2 shared this.is -' - -test_expect_success 'config private to linked worktree' ' - git -C wt1 config --worktree this.is for-wt1 && - test_cmp_config for-main this.is && - test_cmp_config -C wt1 for-wt1 this.is && - test_cmp_config -C wt2 shared this.is -' - -test_expect_success 'core.bare no longer for main only' ' - test_config core.bare true && - test "$(git rev-parse --is-bare-repository)" = true && - test "$(git -C wt1 rev-parse --is-bare-repository)" = true && - test "$(git -C wt2 rev-parse --is-bare-repository)" = true -' - -test_expect_success 'per-worktree core.bare is picked up' ' - git -C wt1 config --worktree core.bare true && - test "$(git rev-parse --is-bare-repository)" = false && - test "$(git -C wt1 rev-parse --is-bare-repository)" = true && - test "$(git -C wt2 rev-parse --is-bare-repository)" = false -' - -test_expect_success 'config.worktree no longer read without extension' ' - git config --unset extensions.worktreeConfig && - test_cmp_config shared this.is && - test_cmp_config -C wt1 shared this.is && - test_cmp_config -C wt2 shared this.is -' - -test_done |