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/t2015-checkout-unborn.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/t2015-checkout-unborn.sh')
-rwxr-xr-x | third_party/git/t/t2015-checkout-unborn.sh | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/third_party/git/t/t2015-checkout-unborn.sh b/third_party/git/t/t2015-checkout-unborn.sh deleted file mode 100755 index 37bdcedcc952..000000000000 --- a/third_party/git/t/t2015-checkout-unborn.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -test_description='checkout from unborn branch' -. ./test-lib.sh - -test_expect_success 'setup' ' - mkdir parent && - (cd parent && - git init && - echo content >file && - git add file && - git commit -m base - ) && - git fetch parent master:origin -' - -test_expect_success 'checkout from unborn preserves untracked files' ' - echo precious >expect && - echo precious >file && - test_must_fail git checkout -b new origin && - test_cmp expect file -' - -test_expect_success 'checkout from unborn preserves index contents' ' - echo precious >expect && - echo precious >file && - git add file && - test_must_fail git checkout -b new origin && - test_cmp expect file && - git show :file >file && - test_cmp expect file -' - -test_expect_success 'checkout from unborn merges identical index contents' ' - echo content >file && - git add file && - git checkout -b new origin -' - -test_expect_success 'checking out another branch from unborn state' ' - git checkout --orphan newroot && - git checkout -b anothername && - test_must_fail git show-ref --verify refs/heads/newroot && - git symbolic-ref HEAD >actual && - echo refs/heads/anothername >expect && - test_cmp expect actual -' - -test_expect_success 'checking out in a newly created repo' ' - test_create_repo empty && - ( - cd empty && - git symbolic-ref HEAD >expect && - test_must_fail git checkout && - git symbolic-ref HEAD >actual && - test_cmp expect actual - ) -' - -test_done |