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/t2011-checkout-invalid-head.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/t2011-checkout-invalid-head.sh')
-rwxr-xr-x | third_party/git/t/t2011-checkout-invalid-head.sh | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/third_party/git/t/t2011-checkout-invalid-head.sh b/third_party/git/t/t2011-checkout-invalid-head.sh deleted file mode 100755 index 0e8d56aa7631..000000000000 --- a/third_party/git/t/t2011-checkout-invalid-head.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -test_description='checkout switching away from an invalid branch' - -. ./test-lib.sh - -test_expect_success 'setup' ' - echo hello >world && - git add world && - git commit -m initial -' - -test_expect_success 'checkout should not start branch from a tree' ' - test_must_fail git checkout -b newbranch master^{tree} -' - -test_expect_success 'checkout master from invalid HEAD' ' - echo $ZERO_OID >.git/HEAD && - git checkout master -- -' - -test_expect_success 'checkout notices failure to lock HEAD' ' - test_when_finished "rm -f .git/HEAD.lock" && - >.git/HEAD.lock && - test_must_fail git checkout -b other -' - -test_expect_success 'create ref directory/file conflict scenario' ' - git update-ref refs/heads/outer/inner master && - - # do not rely on symbolic-ref to get a known state, - # as it may use the same code we are testing - reset_to_df () { - echo "ref: refs/heads/outer" >.git/HEAD - } -' - -test_expect_success 'checkout away from d/f HEAD (unpacked, to branch)' ' - reset_to_df && - git checkout master -' - -test_expect_success 'checkout away from d/f HEAD (unpacked, to detached)' ' - reset_to_df && - git checkout --detach master -' - -test_expect_success 'pack refs' ' - git pack-refs --all --prune -' - -test_expect_success 'checkout away from d/f HEAD (packed, to branch)' ' - reset_to_df && - git checkout master -' - -test_expect_success 'checkout away from d/f HEAD (packed, to detached)' ' - reset_to_df && - git checkout --detach master -' -test_done |