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/t2019-checkout-ambiguous-ref.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/t2019-checkout-ambiguous-ref.sh')
-rwxr-xr-x | third_party/git/t/t2019-checkout-ambiguous-ref.sh | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/third_party/git/t/t2019-checkout-ambiguous-ref.sh b/third_party/git/t/t2019-checkout-ambiguous-ref.sh deleted file mode 100755 index b99d5192a96e..000000000000 --- a/third_party/git/t/t2019-checkout-ambiguous-ref.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh - -test_description='checkout handling of ambiguous (branch/tag) refs' -. ./test-lib.sh - -test_expect_success 'setup ambiguous refs' ' - test_commit branch file && - git branch ambiguity && - git branch vagueness && - test_commit tag file && - git tag ambiguity && - git tag vagueness HEAD:file && - test_commit other file -' - -test_expect_success 'checkout ambiguous ref succeeds' ' - git checkout ambiguity >stdout 2>stderr -' - -test_expect_success 'checkout produces ambiguity warning' ' - grep "warning.*ambiguous" stderr -' - -test_expect_success 'checkout chooses branch over tag' ' - echo refs/heads/ambiguity >expect && - git symbolic-ref HEAD >actual && - test_cmp expect actual && - echo branch >expect && - test_cmp expect file -' - -test_expect_success 'checkout reports switch to branch' ' - test_i18ngrep "Switched to branch" stderr && - test_i18ngrep ! "^HEAD is now at" stderr -' - -test_expect_success 'checkout vague ref succeeds' ' - git checkout vagueness >stdout 2>stderr && - test_set_prereq VAGUENESS_SUCCESS -' - -test_expect_success VAGUENESS_SUCCESS 'checkout produces ambiguity warning' ' - grep "warning.*ambiguous" stderr -' - -test_expect_success VAGUENESS_SUCCESS 'checkout chooses branch over tag' ' - echo refs/heads/vagueness >expect && - git symbolic-ref HEAD >actual && - test_cmp expect actual && - echo branch >expect && - test_cmp expect file -' - -test_expect_success VAGUENESS_SUCCESS 'checkout reports switch to branch' ' - test_i18ngrep "Switched to branch" stderr && - test_i18ngrep ! "^HEAD is now at" stderr -' - -test_done |