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/t6004-rev-list-path-optim.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/t6004-rev-list-path-optim.sh')
-rwxr-xr-x | third_party/git/t/t6004-rev-list-path-optim.sh | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/third_party/git/t/t6004-rev-list-path-optim.sh b/third_party/git/t/t6004-rev-list-path-optim.sh deleted file mode 100755 index 3e8c42ee0b93..000000000000 --- a/third_party/git/t/t6004-rev-list-path-optim.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -test_description='git rev-list trivial path optimization test - - d/z1 - b0 b1 - o------------------------*----o master - / / - o---------o----o----o----o side - a0 c0 c1 a1 c2 - d/f0 d/f1 - d/z0 - -' - -. ./test-lib.sh - -test_expect_success setup ' - echo Hello >a && - mkdir d && - echo World >d/f && - echo World >d/z && - git add a d && - test_tick && - git commit -m "Initial commit" && - git rev-parse --verify HEAD && - git tag initial -' - -test_expect_success path-optimization ' - test_tick && - commit=$(echo "Unchanged tree" | git commit-tree "HEAD^{tree}" -p HEAD) && - test $(git rev-list $commit | wc -l) = 2 && - test $(git rev-list $commit -- . | wc -l) = 1 -' - -test_expect_success 'further setup' ' - git checkout -b side && - echo Irrelevant >c && - echo Irrelevant >d/f && - git add c d/f && - test_tick && - git commit -m "Side makes an irrelevant commit" && - git tag side_c0 && - echo "More Irrelevancy" >c && - git add c && - test_tick && - git commit -m "Side makes another irrelevant commit" && - echo Bye >a && - git add a && - test_tick && - git commit -m "Side touches a" && - git tag side_a1 && - echo "Yet more Irrelevancy" >c && - git add c && - test_tick && - git commit -m "Side makes yet another irrelevant commit" && - git checkout master && - echo Another >b && - echo Munged >d/z && - git add b d/z && - test_tick && - git commit -m "Master touches b" && - git tag master_b0 && - git merge side && - echo Touched >b && - git add b && - test_tick && - git commit -m "Master touches b again" -' - -test_expect_success 'path optimization 2' ' - git rev-parse side_a1 initial >expected && - git rev-list HEAD -- a >actual && - test_cmp expected actual -' - -test_expect_success 'pathspec with leading path' ' - git rev-parse master^ master_b0 side_c0 initial >expected && - git rev-list HEAD -- d >actual && - test_cmp expected actual -' - -test_expect_success 'pathspec with glob (1)' ' - git rev-parse master^ master_b0 side_c0 initial >expected && - git rev-list HEAD -- "d/*" >actual && - test_cmp expected actual -' - -test_expect_success 'pathspec with glob (2)' ' - git rev-parse side_c0 initial >expected && - git rev-list HEAD -- "d/[a-m]*" >actual && - test_cmp expected actual -' - -test_done |