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/t2012-checkout-last.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/t2012-checkout-last.sh')
-rwxr-xr-x | third_party/git/t/t2012-checkout-last.sh | 153 |
1 files changed, 0 insertions, 153 deletions
diff --git a/third_party/git/t/t2012-checkout-last.sh b/third_party/git/t/t2012-checkout-last.sh deleted file mode 100755 index e7ba8c505f57..000000000000 --- a/third_party/git/t/t2012-checkout-last.sh +++ /dev/null @@ -1,153 +0,0 @@ -#!/bin/sh - -test_description='checkout can switch to last branch and merge base' - -. ./test-lib.sh - -test_expect_success 'setup' ' - echo hello >world && - git add world && - git commit -m initial && - git branch other && - echo "hello again" >>world && - git add world && - git commit -m second -' - -test_expect_success '"checkout -" does not work initially' ' - test_must_fail git checkout - -' - -test_expect_success 'first branch switch' ' - git checkout other -' - -test_expect_success '"checkout -" switches back' ' - git checkout - && - test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master" -' - -test_expect_success '"checkout -" switches forth' ' - git checkout - && - test "z$(git symbolic-ref HEAD)" = "zrefs/heads/other" -' - -test_expect_success 'detach HEAD' ' - git checkout $(git rev-parse HEAD) -' - -test_expect_success '"checkout -" attaches again' ' - git checkout - && - test "z$(git symbolic-ref HEAD)" = "zrefs/heads/other" -' - -test_expect_success '"checkout -" detaches again' ' - git checkout - && - test "z$(git rev-parse HEAD)" = "z$(git rev-parse other)" && - test_must_fail git symbolic-ref HEAD -' - -test_expect_success 'more switches' ' - for i in 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 - do - git checkout -b branch$i - done -' - -more_switches () { - for i in 16 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1 - do - git checkout branch$i - done -} - -test_expect_success 'switch to the last' ' - more_switches && - git checkout @{-1} && - test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch2" -' - -test_expect_success 'switch to second from the last' ' - more_switches && - git checkout @{-2} && - test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch3" -' - -test_expect_success 'switch to third from the last' ' - more_switches && - git checkout @{-3} && - test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch4" -' - -test_expect_success 'switch to fourth from the last' ' - more_switches && - git checkout @{-4} && - test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch5" -' - -test_expect_success 'switch to twelfth from the last' ' - more_switches && - git checkout @{-12} && - test "z$(git symbolic-ref HEAD)" = "zrefs/heads/branch13" -' - -test_expect_success 'merge base test setup' ' - git checkout -b another other && - echo "hello again" >>world && - git add world && - git commit -m third -' - -test_expect_success 'another...master' ' - git checkout another && - git checkout another...master && - test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)" -' - -test_expect_success '...master' ' - git checkout another && - git checkout ...master && - test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)" -' - -test_expect_success 'master...' ' - git checkout another && - git checkout master... && - test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)" -' - -test_expect_success '"checkout -" works after a rebase A' ' - git checkout master && - git checkout other && - git rebase master && - git checkout - && - test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master" -' - -test_expect_success '"checkout -" works after a rebase A B' ' - git branch moodle master~1 && - git checkout master && - git checkout other && - git rebase master moodle && - git checkout - && - test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master" -' - -test_expect_success '"checkout -" works after a rebase -i A' ' - git checkout master && - git checkout other && - git rebase -i master && - git checkout - && - test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master" -' - -test_expect_success '"checkout -" works after a rebase -i A B' ' - git branch foodle master~1 && - git checkout master && - git checkout other && - git rebase master foodle && - git checkout - && - test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master" -' - -test_done |