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/t3101-ls-tree-dirname.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/t3101-ls-tree-dirname.sh')
-rwxr-xr-x | third_party/git/t/t3101-ls-tree-dirname.sh | 229 |
1 files changed, 0 insertions, 229 deletions
diff --git a/third_party/git/t/t3101-ls-tree-dirname.sh b/third_party/git/t/t3101-ls-tree-dirname.sh deleted file mode 100755 index 12bf31022a87..000000000000 --- a/third_party/git/t/t3101-ls-tree-dirname.sh +++ /dev/null @@ -1,229 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2005 Junio C Hamano -# Copyright (c) 2005 Robert Fitzsimons -# - -test_description='git ls-tree directory and filenames handling. - -This test runs git ls-tree with the following in a tree. - - 1.txt - a file - 2.txt - a file - path0/a/b/c/1.txt - a file in a directory - path1/b/c/1.txt - a file in a directory - path2/1.txt - a file in a directory - path3/1.txt - a file in a directory - path3/2.txt - a file in a directory - -Test the handling of multiple directories which have matching file -entries. Also test odd filename and missing entries handling. -' -. ./test-lib.sh - -test_expect_success 'setup' ' - echo 111 >1.txt && - echo 222 >2.txt && - mkdir path0 path0/a path0/a/b path0/a/b/c && - echo 111 >path0/a/b/c/1.txt && - mkdir path1 path1/b path1/b/c && - echo 111 >path1/b/c/1.txt && - mkdir path2 && - echo 111 >path2/1.txt && - mkdir path3 && - echo 111 >path3/1.txt && - echo 222 >path3/2.txt && - find *.txt 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 1.txt -100644 blob X 2.txt -040000 tree X path0 -040000 tree X path1 -040000 tree X path2 -040000 tree X path3 -EOF - test_output -' - -# Recursive does not show tree nodes anymore... -test_expect_success 'ls-tree recursive' ' - git ls-tree -r $tree >current && - cat >expected <<\EOF && -100644 blob X 1.txt -100644 blob X 2.txt -100644 blob X path0/a/b/c/1.txt -100644 blob X path1/b/c/1.txt -100644 blob X path2/1.txt -100644 blob X path3/1.txt -100644 blob X path3/2.txt -EOF - test_output -' - -test_expect_success 'ls-tree filter 1.txt' ' - git ls-tree $tree 1.txt >current && - cat >expected <<\EOF && -100644 blob X 1.txt -EOF - test_output -' - -test_expect_success 'ls-tree filter path1/b/c/1.txt' ' - git ls-tree $tree path1/b/c/1.txt >current && - cat >expected <<\EOF && -100644 blob X path1/b/c/1.txt -EOF - test_output -' - -test_expect_success 'ls-tree filter all 1.txt files' ' - git ls-tree $tree 1.txt path0/a/b/c/1.txt \ - path1/b/c/1.txt path2/1.txt path3/1.txt >current && - cat >expected <<\EOF && -100644 blob X 1.txt -100644 blob X path0/a/b/c/1.txt -100644 blob X path1/b/c/1.txt -100644 blob X path2/1.txt -100644 blob X path3/1.txt -EOF - test_output -' - -# I am not so sure about this one after ls-tree doing pathspec match. -# Having both path0/a and path0/a/b/c makes path0/a redundant, and -# it behaves as if path0/a/b/c, path1/b/c, path2 and path3 are specified. -test_expect_success 'ls-tree filter directories' ' - git ls-tree $tree path3 path2 path0/a/b/c path1/b/c path0/a >current && - cat >expected <<\EOF && -040000 tree X path0/a/b/c -040000 tree X path1/b/c -040000 tree X path2 -040000 tree X path3 -EOF - test_output -' - -# Again, duplicates are filtered away so this is equivalent to -# having 1.txt and path3 -test_expect_success 'ls-tree filter odd names' ' - git ls-tree $tree 1.txt ./1.txt .//1.txt \ - path3/1.txt path3/./1.txt path3 path3// >current && - cat >expected <<\EOF && -100644 blob X 1.txt -100644 blob X path3/1.txt -100644 blob X path3/2.txt -EOF - test_output -' - -test_expect_success 'ls-tree filter missing files and extra slashes' ' - git ls-tree $tree 1.txt/ abc.txt \ - path3//23.txt path3/2.txt/// >current && - >expected && - test_output -' - -test_expect_success 'ls-tree filter is leading path match' ' - git ls-tree $tree pa path3/a >current && - >expected && - test_output -' - -test_expect_success 'ls-tree --full-name' ' - ( - cd path0 && - git ls-tree --full-name $tree a - ) >current && - cat >expected <<\EOF && -040000 tree X path0/a -EOF - test_output -' - -test_expect_success 'ls-tree --full-tree' ' - ( - cd path1/b/c && - git ls-tree --full-tree $tree - ) >current && - cat >expected <<\EOF && -100644 blob X 1.txt -100644 blob X 2.txt -040000 tree X path0 -040000 tree X path1 -040000 tree X path2 -040000 tree X path3 -EOF - test_output -' - -test_expect_success 'ls-tree --full-tree -r' ' - ( - cd path3/ && - git ls-tree --full-tree -r $tree - ) >current && - cat >expected <<\EOF && -100644 blob X 1.txt -100644 blob X 2.txt -100644 blob X path0/a/b/c/1.txt -100644 blob X path1/b/c/1.txt -100644 blob X path2/1.txt -100644 blob X path3/1.txt -100644 blob X path3/2.txt -EOF - test_output -' - -test_expect_success 'ls-tree --abbrev=5' ' - git ls-tree --abbrev=5 $tree >current && - sed -e "s/ $_x05[0-9a-f]* / X /" <current >check && - cat >expected <<\EOF && -100644 blob X 1.txt -100644 blob X 2.txt -040000 tree X path0 -040000 tree X path1 -040000 tree X path2 -040000 tree X path3 -EOF - test_cmp expected check -' - -test_expect_success 'ls-tree --name-only' ' - git ls-tree --name-only $tree >current && - cat >expected <<\EOF && -1.txt -2.txt -path0 -path1 -path2 -path3 -EOF - test_output -' - -test_expect_success 'ls-tree --name-only -r' ' - git ls-tree --name-only -r $tree >current && - cat >expected <<\EOF && -1.txt -2.txt -path0/a/b/c/1.txt -path1/b/c/1.txt -path2/1.txt -path3/1.txt -path3/2.txt -EOF - test_output -' - -test_done |