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/t5404-tracking-branches.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/t5404-tracking-branches.sh')
-rwxr-xr-x | third_party/git/t/t5404-tracking-branches.sh | 62 |
1 files changed, 0 insertions, 62 deletions
diff --git a/third_party/git/t/t5404-tracking-branches.sh b/third_party/git/t/t5404-tracking-branches.sh deleted file mode 100755 index 2762f420bc2c..000000000000 --- a/third_party/git/t/t5404-tracking-branches.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh - -test_description='tracking branch update checks for git push' - -. ./test-lib.sh - -test_expect_success 'setup' ' - echo 1 >file && - git add file && - git commit -m 1 && - git branch b1 && - git branch b2 && - git branch b3 && - git clone . aa && - git checkout b1 && - echo b1 >>file && - git commit -a -m b1 && - git checkout b2 && - echo b2 >>file && - git commit -a -m b2 -' - -test_expect_success 'prepare pushable branches' ' - cd aa && - b1=$(git rev-parse origin/b1) && - b2=$(git rev-parse origin/b2) && - git checkout -b b1 origin/b1 && - echo aa-b1 >>file && - git commit -a -m aa-b1 && - git checkout -b b2 origin/b2 && - echo aa-b2 >>file && - git commit -a -m aa-b2 && - git checkout master && - echo aa-master >>file && - git commit -a -m aa-master -' - -test_expect_success 'mixed-success push returns error' ' - test_must_fail git push origin : -' - -test_expect_success 'check tracking branches updated correctly after push' ' - test "$(git rev-parse origin/master)" = "$(git rev-parse master)" -' - -test_expect_success 'check tracking branches not updated for failed refs' ' - test "$(git rev-parse origin/b1)" = "$b1" && - test "$(git rev-parse origin/b2)" = "$b2" -' - -test_expect_success 'deleted branches have their tracking branches removed' ' - git push origin :b1 && - test "$(git rev-parse origin/b1)" = "origin/b1" -' - -test_expect_success 'already deleted tracking branches ignored' ' - git branch -d -r origin/b3 && - git push origin :b3 >output 2>&1 && - ! grep "^error: " output -' - -test_done |