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/t2010-checkout-ambiguous.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/t2010-checkout-ambiguous.sh')
| -rwxr-xr-x | third_party/git/t/t2010-checkout-ambiguous.sh | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/third_party/git/t/t2010-checkout-ambiguous.sh b/third_party/git/t/t2010-checkout-ambiguous.sh deleted file mode 100755 index 2e47fe01cfaf..000000000000 --- a/third_party/git/t/t2010-checkout-ambiguous.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh - -test_description='checkout and pathspecs/refspecs ambiguities' - -. ./test-lib.sh - -test_expect_success 'setup' ' - echo hello >world && - echo hello >all && - git add all world && - git commit -m initial && - git branch world -' - -test_expect_success 'reference must be a tree' ' - test_must_fail git checkout $(git hash-object ./all) -- -' - -test_expect_success 'branch switching' ' - test "refs/heads/master" = "$(git symbolic-ref HEAD)" && - git checkout world -- && - test "refs/heads/world" = "$(git symbolic-ref HEAD)" -' - -test_expect_success 'checkout world from the index' ' - echo bye > world && - git checkout -- world && - git diff --exit-code --quiet -' - -test_expect_success 'non ambiguous call' ' - git checkout all -' - -test_expect_success 'allow the most common case' ' - git checkout world && - test "refs/heads/world" = "$(git symbolic-ref HEAD)" -' - -test_expect_success 'check ambiguity' ' - test_must_fail git checkout world all -' - -test_expect_success 'check ambiguity in subdir' ' - mkdir sub && - # not ambiguous because sub/world does not exist - git -C sub checkout world ../all && - echo hello >sub/world && - # ambiguous because sub/world does exist - test_must_fail git -C sub checkout world ../all -' - -test_expect_success 'disambiguate checking out from a tree-ish' ' - echo bye > world && - git checkout world -- world && - git diff --exit-code --quiet -' - -test_expect_success 'accurate error message with more than one ref' ' - test_must_fail git checkout HEAD master -- 2>actual && - test_i18ngrep 2 actual && - test_i18ngrep "one reference expected, 2 given" actual -' - -test_done |