diff options
Diffstat (limited to 't/t3100-ls-tree-restrict.sh')
| -rwxr-xr-x | t/t3100-ls-tree-restrict.sh | 76 |
1 files changed, 43 insertions, 33 deletions
diff --git a/t/t3100-ls-tree-restrict.sh b/t/t3100-ls-tree-restrict.sh index 2ec06d3d39..eee0d344d2 100755 --- a/t/t3100-ls-tree-restrict.sh +++ b/t/t3100-ls-tree-restrict.sh @@ -3,9 +3,9 @@ # Copyright (c) 2005 Junio C Hamano # -test_description='git-ls-tree test. +test_description='git ls-tree test. -This test runs git-ls-tree with the following in a tree. +This test runs git ls-tree with the following in a tree. path0 - a file path1 - a symlink @@ -22,26 +22,36 @@ test_expect_success \ 'setup' \ 'mkdir path2 path2/baz && echo Hi >path0 && - ln -s path0 path1 && + if test_have_prereq SYMLINKS + then + ln -s path0 path1 && + ln -s ../path1 path2/bazbo + make_expected () { + cat >expected + } + else + printf path0 > path1 && + printf ../path1 > path2/bazbo + make_expected () { + sed -e "s/120000 /100644 /" >expected + } + fi && echo Lo >path2/foo && - ln -s ../path1 path2/bazbo && echo Mi >path2/baz/b && find path? \( -type f -o -type l \) -print | - xargs git-update-index --add && - tree=`git-write-tree` && + xargs git update-index --add && + tree=`git write-tree` && echo $tree' -_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' -_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" test_output () { sed -e "s/ $_x40 / X /" <current >check - diff -u expected check + test_cmp expected check } test_expect_success \ 'ls-tree plain' \ - 'git-ls-tree $tree >current && - cat >expected <<\EOF && + 'git ls-tree $tree >current && + make_expected <<\EOF && 100644 blob X path0 120000 blob X path1 040000 tree X path2 @@ -50,8 +60,8 @@ EOF test_expect_success \ 'ls-tree recursive' \ - 'git-ls-tree -r $tree >current && - cat >expected <<\EOF && + 'git ls-tree -r $tree >current && + make_expected <<\EOF && 100644 blob X path0 120000 blob X path1 100644 blob X path2/baz/b @@ -62,8 +72,8 @@ EOF test_expect_success \ 'ls-tree recursive with -t' \ - 'git-ls-tree -r -t $tree >current && - cat >expected <<\EOF && + 'git ls-tree -r -t $tree >current && + make_expected <<\EOF && 100644 blob X path0 120000 blob X path1 040000 tree X path2 @@ -76,8 +86,8 @@ EOF test_expect_success \ 'ls-tree recursive with -d' \ - 'git-ls-tree -r -d $tree >current && - cat >expected <<\EOF && + 'git ls-tree -r -d $tree >current && + make_expected <<\EOF && 040000 tree X path2 040000 tree X path2/baz EOF @@ -85,8 +95,8 @@ EOF test_expect_success \ 'ls-tree filtered with path' \ - 'git-ls-tree $tree path >current && - cat >expected <<\EOF && + 'git ls-tree $tree path >current && + make_expected <<\EOF && EOF test_output' @@ -95,8 +105,8 @@ EOF # 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 && + 'git ls-tree $tree path1 path0 >current && + make_expected <<\EOF && 100644 blob X path0 120000 blob X path1 EOF @@ -104,8 +114,8 @@ EOF test_expect_success \ 'ls-tree filtered with path0/' \ - 'git-ls-tree $tree path0/ >current && - cat >expected <<\EOF && + 'git ls-tree $tree path0/ >current && + make_expected <<\EOF && EOF test_output' @@ -113,8 +123,8 @@ EOF # with pathspec semantics it shows only path2 test_expect_success \ 'ls-tree filtered with path2' \ - 'git-ls-tree $tree path2 >current && - cat >expected <<\EOF && + 'git ls-tree $tree path2 >current && + make_expected <<\EOF && 040000 tree X path2 EOF test_output' @@ -122,8 +132,8 @@ EOF # ... and path2/ shows the children. test_expect_success \ 'ls-tree filtered with path2/' \ - 'git-ls-tree $tree path2/ >current && - cat >expected <<\EOF && + 'git ls-tree $tree path2/ >current && + make_expected <<\EOF && 040000 tree X path2/baz 120000 blob X path2/bazbo 100644 blob X path2/foo @@ -134,23 +144,23 @@ EOF # path2/baz test_expect_success \ 'ls-tree filtered with path2/baz' \ - 'git-ls-tree $tree path2/baz >current && - cat >expected <<\EOF && + 'git ls-tree $tree path2/baz >current && + make_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 && + 'git ls-tree $tree path2/bak >current && + make_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 && + 'git ls-tree -t $tree path2/bak >current && + make_expected <<\EOF && 040000 tree X path2 EOF test_output' |