summaryrefslogtreecommitdiff
path: root/t/t3100-ls-tree-restrict.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-28 02:32:42 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-28 23:06:29 -0800
commit246cc52f388cae8ca99e5a12b8458c9bfa467765 (patch)
tree2bac4ed4b5d0b6b3d995bef893d2161e90bac517 /t/t3100-ls-tree-restrict.sh
parent32b5904b5f94829aa7ae11b585ca9c639d57cc74 (diff)
downloadgit-246cc52f388cae8ca99e5a12b8458c9bfa467765.tar.gz
ls-tree: match the test to the new semantics.
The diff for this commit is a good illustration of what changed in ls-tree behaviour. - With -r, tree nodes themselves are not shown anymore, but blobs in subtrees are shown. - The order of paths parameters do not matter, since they are not like arguments to /bin/ls, but are filter patterns. - When filter patterns overlap, unintuitive things happen. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t3100-ls-tree-restrict.sh')
-rwxr-xr-xt/t3100-ls-tree-restrict.sh35
1 files changed, 12 insertions, 23 deletions
diff --git a/t/t3100-ls-tree-restrict.sh b/t/t3100-ls-tree-restrict.sh
index c6ce56c86b..ae086755ea 100755
--- a/t/t3100-ls-tree-restrict.sh
+++ b/t/t3100-ls-tree-restrict.sh
@@ -54,8 +54,6 @@ test_expect_success \
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
@@ -70,12 +68,14 @@ 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 &&
-120000 blob X path1
100644 blob X path0
+120000 blob X path1
EOF
test_output'
@@ -86,45 +86,34 @@ test_expect_success \
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
-040000 tree X path2/baz
-120000 blob X path2/bazbo
-100644 blob X path2/foo
-EOF
- test_output'
-
-test_expect_success \
- 'ls-tree filtered with path2/baz' \
- 'git-ls-tree $tree path2/baz >current &&
- cat >expected <<\EOF &&
-040000 tree X path2/baz
-100644 blob X path2/baz/b
EOF
test_output'
+# ... and path2/ shows the children.
test_expect_success \
- 'ls-tree filtered with path2' \
- 'git-ls-tree $tree path2 >current &&
+ 'ls-tree filtered with path2/' \
+ 'git-ls-tree $tree path2/ >current &&
cat >expected <<\EOF &&
-040000 tree X path2
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/' \
- 'git-ls-tree $tree path2/ >current &&
+ 'ls-tree filtered with path2/baz' \
+ 'git-ls-tree $tree path2/baz >current &&
cat >expected <<\EOF &&
-040000 tree X path2
040000 tree X path2/baz
-120000 blob X path2/bazbo
-100644 blob X path2/foo
EOF
test_output'