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/t5618-alternate-refs.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/t5618-alternate-refs.sh')
-rwxr-xr-x | third_party/git/t/t5618-alternate-refs.sh | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/third_party/git/t/t5618-alternate-refs.sh b/third_party/git/t/t5618-alternate-refs.sh deleted file mode 100755 index 3353216f09e5..000000000000 --- a/third_party/git/t/t5618-alternate-refs.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -test_description='test handling of --alternate-refs traversal' -. ./test-lib.sh - -# Avoid test_commit because we want a specific and known set of refs: -# -# base -- one -# \ \ -# two -- merged -# -# where "one" and "two" are on separate refs, and "merged" is available only in -# the dependent child repository. -test_expect_success 'set up local refs' ' - git checkout -b one && - test_tick && - git commit --allow-empty -m base && - test_tick && - git commit --allow-empty -m one && - git checkout -b two HEAD^ && - test_tick && - git commit --allow-empty -m two -' - -# We'll enter the child repository after it's set up since that's where -# all of the subsequent tests will want to run (and it's easy to forget a -# "-C child" and get nonsense results). -test_expect_success 'set up shared clone' ' - git clone -s . child && - cd child && - git merge origin/one -' - -test_expect_success 'rev-list --alternate-refs' ' - git rev-list --remotes=origin >expect && - git rev-list --alternate-refs >actual && - test_cmp expect actual -' - -test_expect_success 'rev-list --not --alternate-refs' ' - git rev-parse HEAD >expect && - git rev-list HEAD --not --alternate-refs >actual && - test_cmp expect actual -' - -test_expect_success 'limiting with alternateRefsPrefixes' ' - test_config core.alternateRefsPrefixes refs/heads/one && - git rev-list origin/one >expect && - git rev-list --alternate-refs >actual && - test_cmp expect actual -' - -test_expect_success 'log --source shows .alternate marker' ' - git log --oneline --source --remotes=origin >expect.orig && - sed "s/origin.* /.alternate /" <expect.orig >expect && - git log --oneline --source --alternate-refs >actual && - test_cmp expect actual -' - -test_done |