]>
Commit | Line | Data |
---|---|---|
ab1630a3 RF |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2005 Junio C Hamano | |
4 | # Copyright (c) 2005 Robert Fitzsimons | |
5 | # | |
6 | ||
5be60078 | 7 | test_description='git ls-tree directory and filenames handling. |
ab1630a3 | 8 | |
5be60078 | 9 | This test runs git ls-tree with the following in a tree. |
ab1630a3 RF |
10 | |
11 | 1.txt - a file | |
12 | 2.txt - a file | |
13 | path0/a/b/c/1.txt - a file in a directory | |
14 | path1/b/c/1.txt - a file in a directory | |
15 | path2/1.txt - a file in a directory | |
16 | path3/1.txt - a file in a directory | |
17 | path3/2.txt - a file in a directory | |
18 | ||
19 | Test the handling of mulitple directories which have matching file | |
20 | entries. Also test odd filename and missing entries handling. | |
21 | ' | |
22 | . ./test-lib.sh | |
23 | ||
24 | test_expect_success \ | |
25 | 'setup' \ | |
26 | 'echo 111 >1.txt && | |
27 | echo 222 >2.txt && | |
28 | mkdir path0 path0/a path0/a/b path0/a/b/c && | |
29 | echo 111 >path0/a/b/c/1.txt && | |
30 | mkdir path1 path1/b path1/b/c && | |
31 | echo 111 >path1/b/c/1.txt && | |
32 | mkdir path2 && | |
33 | echo 111 >path2/1.txt && | |
34 | mkdir path3 && | |
35 | echo 111 >path3/1.txt && | |
36 | echo 222 >path3/2.txt && | |
37 | find *.txt path* \( -type f -o -type l \) -print | | |
5be60078 JH |
38 | xargs git update-index --add && |
39 | tree=`git write-tree` && | |
ab1630a3 RF |
40 | echo $tree' |
41 | ||
42 | _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' | |
43 | _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" | |
44 | test_output () { | |
45 | sed -e "s/ $_x40 / X /" <current >check | |
3af82863 | 46 | test_cmp expected check |
ab1630a3 RF |
47 | } |
48 | ||
49 | test_expect_success \ | |
50 | 'ls-tree plain' \ | |
5be60078 | 51 | 'git ls-tree $tree >current && |
ab1630a3 RF |
52 | cat >expected <<\EOF && |
53 | 100644 blob X 1.txt | |
54 | 100644 blob X 2.txt | |
55 | 040000 tree X path0 | |
56 | 040000 tree X path1 | |
57 | 040000 tree X path2 | |
58 | 040000 tree X path3 | |
59 | EOF | |
60 | test_output' | |
61 | ||
246cc52f | 62 | # Recursive does not show tree nodes anymore... |
ab1630a3 RF |
63 | test_expect_success \ |
64 | 'ls-tree recursive' \ | |
5be60078 | 65 | 'git ls-tree -r $tree >current && |
ab1630a3 RF |
66 | cat >expected <<\EOF && |
67 | 100644 blob X 1.txt | |
68 | 100644 blob X 2.txt | |
ab1630a3 | 69 | 100644 blob X path0/a/b/c/1.txt |
ab1630a3 | 70 | 100644 blob X path1/b/c/1.txt |
ab1630a3 | 71 | 100644 blob X path2/1.txt |
ab1630a3 RF |
72 | 100644 blob X path3/1.txt |
73 | 100644 blob X path3/2.txt | |
74 | EOF | |
75 | test_output' | |
76 | ||
77 | test_expect_success \ | |
78 | 'ls-tree filter 1.txt' \ | |
5be60078 | 79 | 'git ls-tree $tree 1.txt >current && |
ab1630a3 RF |
80 | cat >expected <<\EOF && |
81 | 100644 blob X 1.txt | |
82 | EOF | |
83 | test_output' | |
84 | ||
85 | test_expect_success \ | |
86 | 'ls-tree filter path1/b/c/1.txt' \ | |
5be60078 | 87 | 'git ls-tree $tree path1/b/c/1.txt >current && |
ab1630a3 RF |
88 | cat >expected <<\EOF && |
89 | 100644 blob X path1/b/c/1.txt | |
90 | EOF | |
91 | test_output' | |
92 | ||
93 | test_expect_success \ | |
94 | 'ls-tree filter all 1.txt files' \ | |
5be60078 | 95 | 'git ls-tree $tree 1.txt path0/a/b/c/1.txt path1/b/c/1.txt path2/1.txt path3/1.txt >current && |
ab1630a3 RF |
96 | cat >expected <<\EOF && |
97 | 100644 blob X 1.txt | |
98 | 100644 blob X path0/a/b/c/1.txt | |
99 | 100644 blob X path1/b/c/1.txt | |
100 | 100644 blob X path2/1.txt | |
101 | 100644 blob X path3/1.txt | |
102 | EOF | |
103 | test_output' | |
104 | ||
246cc52f JH |
105 | # I am not so sure about this one after ls-tree doing pathspec match. |
106 | # Having both path0/a and path0/a/b/c makes path0/a redundant, and | |
107 | # it behaves as if path0/a/b/c, path1/b/c, path2 and path3 are specified. | |
ab1630a3 RF |
108 | test_expect_success \ |
109 | 'ls-tree filter directories' \ | |
5be60078 | 110 | 'git ls-tree $tree path3 path2 path0/a/b/c path1/b/c path0/a >current && |
ab1630a3 | 111 | cat >expected <<\EOF && |
ab1630a3 | 112 | 040000 tree X path0/a/b/c |
ab1630a3 | 113 | 040000 tree X path1/b/c |
246cc52f JH |
114 | 040000 tree X path2 |
115 | 040000 tree X path3 | |
ab1630a3 RF |
116 | EOF |
117 | test_output' | |
118 | ||
246cc52f JH |
119 | # Again, duplicates are filtered away so this is equivalent to |
120 | # having 1.txt and path3 | |
ab1630a3 RF |
121 | test_expect_success \ |
122 | 'ls-tree filter odd names' \ | |
3296766e | 123 | 'git ls-tree $tree 1.txt ./1.txt .//1.txt path3/1.txt path3/./1.txt path3 path3// >current && |
ab1630a3 RF |
124 | cat >expected <<\EOF && |
125 | 100644 blob X 1.txt | |
ab1630a3 RF |
126 | 100644 blob X path3/1.txt |
127 | 100644 blob X path3/2.txt | |
128 | EOF | |
129 | test_output' | |
130 | ||
131 | test_expect_success \ | |
132 | 'ls-tree filter missing files and extra slashes' \ | |
5be60078 | 133 | 'git ls-tree $tree 1.txt/ abc.txt path3//23.txt path3/2.txt/// >current && |
ab1630a3 RF |
134 | cat >expected <<\EOF && |
135 | EOF | |
136 | test_output' | |
137 | ||
138 | test_done |