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/t3100-ls-tree-restrict.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/t3100-ls-tree-restrict.sh')
-rwxr-xr-x | third_party/git/t/t3100-ls-tree-restrict.sh | 165 |
1 files changed, 0 insertions, 165 deletions
diff --git a/third_party/git/t/t3100-ls-tree-restrict.sh b/third_party/git/t/t3100-ls-tree-restrict.sh deleted file mode 100755 index 18baf49a49c7..000000000000 --- a/third_party/git/t/t3100-ls-tree-restrict.sh +++ /dev/null @@ -1,165 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2005 Junio C Hamano -# - -test_description='git ls-tree test. - -This test runs git ls-tree with the following in a tree. - - path0 - a file - path1 - a symlink - path2/foo - a file in a directory - path2/bazbo - a symlink in a directory - path2/baz/b - a file in a directory in a directory - -The new path restriction code should do the right thing for path2 and -path2/baz. Also path0/ should snow nothing. -' -. ./test-lib.sh - -test_expect_success \ - 'setup' \ - 'mkdir path2 path2/baz && - echo Hi >path0 && - test_ln_s_add path0 path1 && - test_ln_s_add ../path1 path2/bazbo && - echo Lo >path2/foo && - echo Mi >path2/baz/b && - find path? \( -type f -o -type l \) -print | - xargs git update-index --add && - tree=$(git write-tree) && - echo $tree' - -test_output () { - sed -e "s/ $OID_REGEX / X /" <current >check - test_cmp expected check -} - -test_expect_success \ - 'ls-tree plain' \ - 'git ls-tree $tree >current && - cat >expected <<\EOF && -100644 blob X path0 -120000 blob X path1 -040000 tree X path2 -EOF - test_output' - -test_expect_success \ - 'ls-tree recursive' \ - 'git ls-tree -r $tree >current && - cat >expected <<\EOF && -100644 blob X path0 -120000 blob X path1 -100644 blob X path2/baz/b -120000 blob X path2/bazbo -100644 blob X path2/foo -EOF - test_output' - -test_expect_success \ - 'ls-tree recursive with -t' \ - 'git ls-tree -r -t $tree >current && - cat >expected <<\EOF && -100644 blob X path0 -120000 blob X path1 -040000 tree X path2 -040000 tree X path2/baz -100644 blob X path2/baz/b -120000 blob X path2/bazbo -100644 blob X path2/foo -EOF - test_output' - -test_expect_success \ - 'ls-tree recursive with -d' \ - 'git ls-tree -r -d $tree >current && - cat >expected <<\EOF && -040000 tree X path2 -040000 tree X path2/baz -EOF - test_output' - -test_expect_success \ - 'ls-tree filtered with path' \ - 'git ls-tree $tree path >current && - cat >expected <<\EOF && -EOF - test_output' - - -# it used to be path1 and then path0, but with pathspec semantics -# they are shown in canonical order. -test_expect_success \ - 'ls-tree filtered with path1 path0' \ - 'git ls-tree $tree path1 path0 >current && - cat >expected <<\EOF && -100644 blob X path0 -120000 blob X path1 -EOF - test_output' - -test_expect_success \ - 'ls-tree filtered with path0/' \ - 'git ls-tree $tree path0/ >current && - cat >expected <<\EOF && -EOF - test_output' - -# It used to show path2 and its immediate children but -# with pathspec semantics it shows only path2 -test_expect_success \ - 'ls-tree filtered with path2' \ - 'git ls-tree $tree path2 >current && - cat >expected <<\EOF && -040000 tree X path2 -EOF - test_output' - -# ... and path2/ shows the children. -test_expect_success \ - 'ls-tree filtered with path2/' \ - 'git ls-tree $tree path2/ >current && - cat >expected <<\EOF && -040000 tree X path2/baz -120000 blob X path2/bazbo -100644 blob X path2/foo -EOF - test_output' - -# The same change -- exact match does not show children of -# path2/baz -test_expect_success \ - 'ls-tree filtered with path2/baz' \ - 'git ls-tree $tree path2/baz >current && - cat >expected <<\EOF && -040000 tree X path2/baz -EOF - test_output' - -test_expect_success \ - 'ls-tree filtered with path2/bak' \ - 'git ls-tree $tree path2/bak >current && - cat >expected <<\EOF && -EOF - test_output' - -test_expect_success \ - 'ls-tree -t filtered with path2/bak' \ - 'git ls-tree -t $tree path2/bak >current && - cat >expected <<\EOF && -040000 tree X path2 -EOF - test_output' - -test_expect_success \ - 'ls-tree with one path a prefix of the other' \ - 'git ls-tree $tree path2/baz path2/bazbo >current && - cat >expected <<\EOF && -040000 tree X path2/baz -120000 blob X path2/bazbo -EOF - test_output' - -test_done |