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/t4044-diff-index-unique-abbrev.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/t4044-diff-index-unique-abbrev.sh')
| -rwxr-xr-x | third_party/git/t/t4044-diff-index-unique-abbrev.sh | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/third_party/git/t/t4044-diff-index-unique-abbrev.sh b/third_party/git/t/t4044-diff-index-unique-abbrev.sh deleted file mode 100755 index 4701796d10e1..000000000000 --- a/third_party/git/t/t4044-diff-index-unique-abbrev.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -test_description='test unique sha1 abbreviation on "index from..to" line' -. ./test-lib.sh - -test_expect_success 'setup' ' - test_oid_cache <<-EOF && - val1 sha1:4827 - val1 sha256:5664 - - val2 sha1:11742 - val2 sha256:10625 - - hash1 sha1:51d2738463ea4ca66f8691c91e33ce64b7d41bb1 - hash1 sha256:ae31dfff0af93b2c62b0098a039b38569c43b0a7e97b873000ca42d128f27350 - - hasht1 sha1:51d27384 - hasht1 sha256:ae31dfff - - hash2 sha1:51d2738efb4ad8a1e40bed839ab8e116f0a15e47 - hash2 sha256:ae31dffada88a46fd5f53c7ed5aa25a7a8951f1d5e88456c317c8d5484d263e5 - - hasht2 sha1:51d2738e - hasht2 sha256:ae31dffa - EOF - - cat >expect_initial <<-EOF && - 100644 blob $(test_oid hash1) foo - EOF - - cat >expect_update <<-EOF && - 100644 blob $(test_oid hash2) foo - EOF - - echo "$(test_oid val1)" > foo && - git add foo && - git commit -m "initial" && - git cat-file -p HEAD: > actual && - test_cmp expect_initial actual && - echo "$(test_oid val2)" > foo && - git commit -a -m "update" && - git cat-file -p HEAD: > actual && - test_cmp expect_update actual -' - -cat >expect <<EOF -index $(test_oid hasht1)..$(test_oid hasht2) 100644 -EOF - -test_expect_success 'diff does not produce ambiguous index line' ' - git diff HEAD^..HEAD | grep index > actual && - test_cmp expect actual -' - -test_done |