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/t1514-rev-parse-push.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/t1514-rev-parse-push.sh')
-rwxr-xr-x | third_party/git/t/t1514-rev-parse-push.sh | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/third_party/git/t/t1514-rev-parse-push.sh b/third_party/git/t/t1514-rev-parse-push.sh deleted file mode 100755 index 788cc91e452c..000000000000 --- a/third_party/git/t/t1514-rev-parse-push.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/sh - -test_description='test <branch>@{push} syntax' -. ./test-lib.sh - -resolve () { - echo "$2" >expect && - git rev-parse --symbolic-full-name "$1" >actual && - test_cmp expect actual -} - -test_expect_success 'setup' ' - git init --bare parent.git && - git init --bare other.git && - git remote add origin parent.git && - git remote add other other.git && - test_commit base && - git push origin HEAD && - git branch --set-upstream-to=origin/master master && - git branch --track topic origin/master && - git push origin topic && - git push other topic -' - -test_expect_success '@{push} with default=nothing' ' - test_config push.default nothing && - test_must_fail git rev-parse master@{push} && - test_must_fail git rev-parse master@{PUSH} && - test_must_fail git rev-parse master@{PuSH} -' - -test_expect_success '@{push} with default=simple' ' - test_config push.default simple && - resolve master@{push} refs/remotes/origin/master && - resolve master@{PUSH} refs/remotes/origin/master && - resolve master@{pUSh} refs/remotes/origin/master -' - -test_expect_success 'triangular @{push} fails with default=simple' ' - test_config push.default simple && - test_must_fail git rev-parse topic@{push} -' - -test_expect_success '@{push} with default=current' ' - test_config push.default current && - resolve topic@{push} refs/remotes/origin/topic -' - -test_expect_success '@{push} with default=matching' ' - test_config push.default matching && - resolve topic@{push} refs/remotes/origin/topic -' - -test_expect_success '@{push} with pushremote defined' ' - test_config push.default current && - test_config branch.topic.pushremote other && - resolve topic@{push} refs/remotes/other/topic -' - -test_expect_success '@{push} with push refspecs' ' - test_config push.default nothing && - test_config remote.origin.push refs/heads/*:refs/heads/magic/* && - git push && - resolve topic@{push} refs/remotes/origin/magic/topic -' - -test_expect_success 'resolving @{push} fails with a detached HEAD' ' - git checkout HEAD^0 && - test_when_finished "git checkout -" && - test_must_fail git rev-parse @{push} -' - -test_done |