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/t2060-switch.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/t2060-switch.sh')
-rwxr-xr-x | third_party/git/t/t2060-switch.sh | 104 |
1 files changed, 0 insertions, 104 deletions
diff --git a/third_party/git/t/t2060-switch.sh b/third_party/git/t/t2060-switch.sh deleted file mode 100755 index 2c1b8c0d6d22..000000000000 --- a/third_party/git/t/t2060-switch.sh +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -test_description='switch basic functionality' - -. ./test-lib.sh - -test_expect_success 'setup' ' - test_commit first && - git branch first-branch && - test_commit second && - test_commit third && - git remote add origin nohost:/nopath && - git update-ref refs/remotes/origin/foo first-branch -' - -test_expect_success 'switch branch no arguments' ' - test_must_fail git switch -' - -test_expect_success 'switch branch' ' - git switch first-branch && - test_path_is_missing second.t -' - -test_expect_success 'switch and detach' ' - test_when_finished git switch master && - test_must_fail git switch master^{commit} && - git switch --detach master^{commit} && - test_must_fail git symbolic-ref HEAD -' - -test_expect_success 'switch and detach current branch' ' - test_when_finished git switch master && - git switch master && - git switch --detach && - test_must_fail git symbolic-ref HEAD -' - -test_expect_success 'switch and create branch' ' - test_when_finished git switch master && - git switch -c temp master^ && - test_cmp_rev master^ refs/heads/temp && - echo refs/heads/temp >expected-branch && - git symbolic-ref HEAD >actual-branch && - test_cmp expected-branch actual-branch -' - -test_expect_success 'force create branch from HEAD' ' - test_when_finished git switch master && - git switch --detach master && - test_must_fail git switch -c temp && - git switch -C temp && - test_cmp_rev master refs/heads/temp && - echo refs/heads/temp >expected-branch && - git symbolic-ref HEAD >actual-branch && - test_cmp expected-branch actual-branch -' - -test_expect_success 'new orphan branch from empty' ' - test_when_finished git switch master && - test_must_fail git switch --orphan new-orphan HEAD && - git switch --orphan new-orphan && - test_commit orphan && - git cat-file commit refs/heads/new-orphan >commit && - ! grep ^parent commit && - git ls-files >tracked-files && - echo orphan.t >expected && - test_cmp expected tracked-files -' - -test_expect_success 'orphan branch works with --discard-changes' ' - test_when_finished git switch master && - echo foo >foo.txt && - git switch --discard-changes --orphan new-orphan2 && - git ls-files >tracked-files && - test_must_be_empty tracked-files -' - -test_expect_success 'switching ignores file of same branch name' ' - test_when_finished git switch master && - : >first-branch && - git switch first-branch && - echo refs/heads/first-branch >expected && - git symbolic-ref HEAD >actual && - test_cmp expected actual -' - -test_expect_success 'guess and create branch ' ' - test_when_finished git switch master && - test_must_fail git switch --no-guess foo && - git switch foo && - echo refs/heads/foo >expected && - git symbolic-ref HEAD >actual && - test_cmp expected actual -' - -test_expect_success 'not switching when something is in progress' ' - test_when_finished rm -f .git/MERGE_HEAD && - # fake a merge-in-progress - cp .git/HEAD .git/MERGE_HEAD && - test_must_fail git switch -d @^ -' - -test_done |