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/t5538-push-shallow.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/t5538-push-shallow.sh')
-rwxr-xr-x | third_party/git/t/t5538-push-shallow.sh | 123 |
1 files changed, 0 insertions, 123 deletions
diff --git a/third_party/git/t/t5538-push-shallow.sh b/third_party/git/t/t5538-push-shallow.sh deleted file mode 100755 index ecbf84d21c80..000000000000 --- a/third_party/git/t/t5538-push-shallow.sh +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/sh - -test_description='push from/to a shallow clone' - -. ./test-lib.sh - -commit() { - echo "$1" >tracked && - git add tracked && - git commit -m "$1" -} - -test_expect_success 'setup' ' - git config --global transfer.fsckObjects true && - commit 1 && - commit 2 && - commit 3 && - commit 4 && - git clone . full && - ( - git init full-abc && - cd full-abc && - commit a && - commit b && - commit c - ) && - git clone --no-local --depth=2 .git shallow && - git --git-dir=shallow/.git log --format=%s >actual && - cat <<EOF >expect && -4 -3 -EOF - test_cmp expect actual && - git clone --no-local --depth=2 full-abc/.git shallow2 && - git --git-dir=shallow2/.git log --format=%s >actual && - cat <<EOF >expect && -c -b -EOF - test_cmp expect actual -' - -test_expect_success 'push from shallow clone' ' - ( - cd shallow && - commit 5 && - git push ../.git +master:refs/remotes/shallow/master - ) && - git log --format=%s shallow/master >actual && - git fsck && - cat <<EOF >expect && -5 -4 -3 -2 -1 -EOF - test_cmp expect actual -' - -test_expect_success 'push from shallow clone, with grafted roots' ' - ( - cd shallow2 && - test_must_fail git push ../.git +master:refs/remotes/shallow2/master 2>err && - grep "shallow2/master.*shallow update not allowed" err - ) && - test_must_fail git rev-parse shallow2/master && - git fsck -' - -test_expect_success 'add new shallow root with receive.updateshallow on' ' - test_config receive.shallowupdate true && - ( - cd shallow2 && - git push ../.git +master:refs/remotes/shallow2/master - ) && - git log --format=%s shallow2/master >actual && - git fsck && - cat <<EOF >expect && -c -b -EOF - test_cmp expect actual -' - -test_expect_success 'push from shallow to shallow' ' - ( - cd shallow && - git --git-dir=../shallow2/.git config receive.shallowupdate true && - git push ../shallow2/.git +master:refs/remotes/shallow/master && - git --git-dir=../shallow2/.git config receive.shallowupdate false - ) && - ( - cd shallow2 && - git log --format=%s shallow/master >actual && - git fsck && - cat <<EOF >expect && -5 -4 -3 -EOF - test_cmp expect actual - ) -' - -test_expect_success 'push from full to shallow' ' - ! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) && - commit 1 && - git push shallow2/.git +master:refs/remotes/top/master && - ( - cd shallow2 && - git log --format=%s top/master >actual && - git fsck && - cat <<EOF >expect && -1 -4 -3 -EOF - test_cmp expect actual && - git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null - ) -' -test_done |