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/t4054-diff-bogus-tree.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/t4054-diff-bogus-tree.sh')
| -rwxr-xr-x | third_party/git/t/t4054-diff-bogus-tree.sh | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/third_party/git/t/t4054-diff-bogus-tree.sh b/third_party/git/t/t4054-diff-bogus-tree.sh deleted file mode 100755 index 8c95f152b23b..000000000000 --- a/third_party/git/t/t4054-diff-bogus-tree.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh - -test_description='test diff with a bogus tree containing the null sha1' -. ./test-lib.sh - -test_expect_success 'create bogus tree' ' - name=$(echo $ZERO_OID | sed -e "s/00/Q/g") && - bogus_tree=$( - printf "100644 fooQ$name" | - q_to_nul | - git hash-object -w --stdin -t tree - ) -' - -test_expect_success 'create tree with matching file' ' - echo bar >foo && - git add foo && - good_tree=$(git write-tree) && - blob=$(git rev-parse :foo) -' - -test_expect_success 'raw diff shows null sha1 (addition)' ' - echo ":000000 100644 $ZERO_OID $ZERO_OID A foo" >expect && - git diff-tree $EMPTY_TREE $bogus_tree >actual && - test_cmp expect actual -' - -test_expect_success 'raw diff shows null sha1 (removal)' ' - echo ":100644 000000 $ZERO_OID $ZERO_OID D foo" >expect && - git diff-tree $bogus_tree $EMPTY_TREE >actual && - test_cmp expect actual -' - -test_expect_success 'raw diff shows null sha1 (modification)' ' - echo ":100644 100644 $blob $ZERO_OID M foo" >expect && - git diff-tree $good_tree $bogus_tree >actual && - test_cmp expect actual -' - -test_expect_success 'raw diff shows null sha1 (other direction)' ' - echo ":100644 100644 $ZERO_OID $blob M foo" >expect && - git diff-tree $bogus_tree $good_tree >actual && - test_cmp expect actual -' - -test_expect_success 'raw diff shows null sha1 (reverse)' ' - echo ":100644 100644 $ZERO_OID $blob M foo" >expect && - git diff-tree -R $good_tree $bogus_tree >actual && - test_cmp expect actual -' - -test_expect_success 'raw diff shows null sha1 (index)' ' - echo ":100644 100644 $ZERO_OID $blob M foo" >expect && - git diff-index $bogus_tree >actual && - test_cmp expect actual -' - -test_expect_success 'patch fails due to bogus sha1 (addition)' ' - test_must_fail git diff-tree -p $EMPTY_TREE $bogus_tree -' - -test_expect_success 'patch fails due to bogus sha1 (removal)' ' - test_must_fail git diff-tree -p $bogus_tree $EMPTY_TREE -' - -test_expect_success 'patch fails due to bogus sha1 (modification)' ' - test_must_fail git diff-tree -p $good_tree $bogus_tree -' - -test_expect_success 'patch fails due to bogus sha1 (other direction)' ' - test_must_fail git diff-tree -p $bogus_tree $good_tree -' - -test_expect_success 'patch fails due to bogus sha1 (reverse)' ' - test_must_fail git diff-tree -R -p $good_tree $bogus_tree -' - -test_expect_success 'patch fails due to bogus sha1 (index)' ' - test_must_fail git diff-index -p $bogus_tree -' - -test_done |