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/t1309-early-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/t1309-early-config.sh')
-rwxr-xr-x | third_party/git/t/t1309-early-config.sh | 102 |
1 files changed, 0 insertions, 102 deletions
diff --git a/third_party/git/t/t1309-early-config.sh b/third_party/git/t/t1309-early-config.sh deleted file mode 100755 index ebb8e1aecbf4..000000000000 --- a/third_party/git/t/t1309-early-config.sh +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -test_description='Test read_early_config()' - -. ./test-lib.sh - -test_expect_success 'read early config' ' - test_config early.config correct && - test-tool config read_early_config early.config >output && - test correct = "$(cat output)" -' - -test_expect_success 'in a sub-directory' ' - test_config early.config sub && - mkdir -p sub && - ( - cd sub && - test-tool config read_early_config early.config - ) >output && - test sub = "$(cat output)" -' - -test_expect_success 'ceiling' ' - test_config early.config ceiling && - mkdir -p sub && - ( - GIT_CEILING_DIRECTORIES="$PWD" && - export GIT_CEILING_DIRECTORIES && - cd sub && - test-tool config read_early_config early.config - ) >output && - test_must_be_empty output -' - -test_expect_success 'ceiling #2' ' - mkdir -p xdg/git && - git config -f xdg/git/config early.config xdg && - test_config early.config ceiling && - mkdir -p sub && - ( - XDG_CONFIG_HOME="$PWD"/xdg && - GIT_CEILING_DIRECTORIES="$PWD" && - export GIT_CEILING_DIRECTORIES XDG_CONFIG_HOME && - cd sub && - test-tool config read_early_config early.config - ) >output && - test xdg = "$(cat output)" -' - -cmdline_config="'test.source=cmdline'" -test_expect_success 'read config file in right order' ' - echo "[test]source = home" >>.gitconfig && - git init foo && - ( - cd foo && - echo "[test]source = repo" >>.git/config && - GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config \ - read_early_config test.source >actual && - cat >expected <<-\EOF && - home - repo - cmdline - EOF - test_cmp expected actual - ) -' - -test_with_config () { - rm -rf throwaway && - git init throwaway && - ( - cd throwaway && - echo "$*" >.git/config && - test-tool config read_early_config early.config - ) -} - -test_expect_success 'ignore .git/ with incompatible repository version' ' - test_with_config "[core]repositoryformatversion = 999999" 2>err && - test_i18ngrep "warning:.* Expected git repo version <= [1-9]" err -' - -test_expect_failure 'ignore .git/ with invalid repository version' ' - test_with_config "[core]repositoryformatversion = invalid" -' - - -test_expect_failure 'ignore .git/ with invalid config' ' - test_with_config "[" -' - -test_expect_success 'early config and onbranch' ' - echo "[broken" >broken && - test_with_config "[includeif \"onbranch:master\"]path=../broken" -' - -test_expect_success 'onbranch config outside of git repo' ' - test_config_global includeIf.onbranch:master.path non-existent && - nongit git help -' - -test_done |