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/t2017-checkout-orphan.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/t2017-checkout-orphan.sh')
-rwxr-xr-x | third_party/git/t/t2017-checkout-orphan.sh | 125 |
1 files changed, 0 insertions, 125 deletions
diff --git a/third_party/git/t/t2017-checkout-orphan.sh b/third_party/git/t/t2017-checkout-orphan.sh deleted file mode 100755 index 655f278c5f87..000000000000 --- a/third_party/git/t/t2017-checkout-orphan.sh +++ /dev/null @@ -1,125 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2010 Erick Mattos -# - -test_description='git checkout --orphan - -Main Tests for --orphan functionality.' - -. ./test-lib.sh - -TEST_FILE=foo - -test_expect_success 'Setup' ' - echo "Initial" >"$TEST_FILE" && - git add "$TEST_FILE" && - git commit -m "First Commit" && - test_tick && - echo "State 1" >>"$TEST_FILE" && - git add "$TEST_FILE" && - test_tick && - git commit -m "Second Commit" -' - -test_expect_success '--orphan creates a new orphan branch from HEAD' ' - git checkout --orphan alpha && - test_must_fail git rev-parse --verify HEAD && - test "refs/heads/alpha" = "$(git symbolic-ref HEAD)" && - test_tick && - git commit -m "Third Commit" && - test_must_fail git rev-parse --verify HEAD^ && - git diff-tree --quiet master alpha -' - -test_expect_success '--orphan creates a new orphan branch from <start_point>' ' - git checkout master && - git checkout --orphan beta master^ && - test_must_fail git rev-parse --verify HEAD && - test "refs/heads/beta" = "$(git symbolic-ref HEAD)" && - test_tick && - git commit -m "Fourth Commit" && - test_must_fail git rev-parse --verify HEAD^ && - git diff-tree --quiet master^ beta -' - -test_expect_success '--orphan must be rejected with -b' ' - git checkout master && - test_must_fail git checkout --orphan new -b newer && - test refs/heads/master = "$(git symbolic-ref HEAD)" -' - -test_expect_success '--orphan must be rejected with -t' ' - git checkout master && - test_must_fail git checkout --orphan new -t master && - test refs/heads/master = "$(git symbolic-ref HEAD)" -' - -test_expect_success '--orphan ignores branch.autosetupmerge' ' - git checkout master && - git config branch.autosetupmerge always && - git checkout --orphan gamma && - test -z "$(git config branch.gamma.merge)" && - test refs/heads/gamma = "$(git symbolic-ref HEAD)" && - test_must_fail git rev-parse --verify HEAD^ -' - -test_expect_success '--orphan makes reflog by default' ' - git checkout master && - git config --unset core.logAllRefUpdates && - git checkout --orphan delta && - test_must_fail git rev-parse --verify delta@{0} && - git commit -m Delta && - git rev-parse --verify delta@{0} -' - -test_expect_success '--orphan does not make reflog when core.logAllRefUpdates = false' ' - git checkout master && - git config core.logAllRefUpdates false && - git checkout --orphan epsilon && - test_must_fail git rev-parse --verify epsilon@{0} && - git commit -m Epsilon && - test_must_fail git rev-parse --verify epsilon@{0} -' - -test_expect_success '--orphan with -l makes reflog when core.logAllRefUpdates = false' ' - git checkout master && - git checkout -l --orphan zeta && - test_must_fail git rev-parse --verify zeta@{0} && - git commit -m Zeta && - git rev-parse --verify zeta@{0} -' - -test_expect_success 'giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog' ' - git checkout master && - git checkout -l --orphan eta && - test_must_fail git rev-parse --verify eta@{0} && - git checkout master && - test_must_fail git rev-parse --verify eta@{0} -' - -test_expect_success '--orphan is rejected with an existing name' ' - git checkout master && - test_must_fail git checkout --orphan master && - test refs/heads/master = "$(git symbolic-ref HEAD)" -' - -test_expect_success '--orphan refuses to switch if a merge is needed' ' - git checkout master && - git reset --hard && - echo local >>"$TEST_FILE" && - cat "$TEST_FILE" >"$TEST_FILE.saved" && - test_must_fail git checkout --orphan new master^ && - test refs/heads/master = "$(git symbolic-ref HEAD)" && - test_cmp "$TEST_FILE" "$TEST_FILE.saved" && - git diff-index --quiet --cached HEAD && - git reset --hard -' - -test_expect_success 'cannot --detach on an unborn branch' ' - git checkout master && - git checkout --orphan new && - test_must_fail git checkout --detach -' - -test_done |