blob: a88b02b06ed34234abfb3aa3131dd31a7d364141 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
|
#!/bin/sh
test_description='git status ignored modes'
. ./test-lib.sh
test_expect_success 'setup initial commit and ignore file' '
cat >.gitignore <<-\EOF &&
*.ign
ignored_dir/
!*.unignore
EOF
git add . &&
git commit -m "Initial commit"
'
test_expect_success 'Verify behavior of status on directories with ignored files' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? expect
? output
! dir/ignored/ignored_1.ign
! dir/ignored/ignored_2.ign
! ignored/ignored_1.ign
! ignored/ignored_2.ign
EOF
mkdir -p ignored dir/ignored &&
touch ignored/ignored_1.ign ignored/ignored_2.ign \
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
test_cmp expect output
'
test_expect_success 'Verify status behavior on directory with tracked & ignored files' '
test_when_finished "git clean -fdx && git reset HEAD~1 --hard" &&
cat >expect <<-\EOF &&
? expect
? output
! dir/tracked_ignored/ignored_1.ign
! dir/tracked_ignored/ignored_2.ign
! tracked_ignored/ignored_1.ign
! tracked_ignored/ignored_2.ign
EOF
mkdir -p tracked_ignored dir/tracked_ignored &&
touch tracked_ignored/tracked_1 tracked_ignored/tracked_2 \
tracked_ignored/ignored_1.ign tracked_ignored/ignored_2.ign \
dir/tracked_ignored/tracked_1 dir/tracked_ignored/tracked_2 \
dir/tracked_ignored/ignored_1.ign dir/tracked_ignored/ignored_2.ign &&
git add tracked_ignored/tracked_1 tracked_ignored/tracked_2 \
dir/tracked_ignored/tracked_1 dir/tracked_ignored/tracked_2 &&
git commit -m "commit tracked files" &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
test_cmp expect output
'
test_expect_success 'Verify status behavior on directory with untracked and ignored files' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? dir/untracked_ignored/untracked_1
? dir/untracked_ignored/untracked_2
? expect
? output
? untracked_ignored/untracked_1
? untracked_ignored/untracked_2
! dir/untracked_ignored/ignored_1.ign
! dir/untracked_ignored/ignored_2.ign
! untracked_ignored/ignored_1.ign
! untracked_ignored/ignored_2.ign
EOF
mkdir -p untracked_ignored dir/untracked_ignored &&
touch untracked_ignored/untracked_1 untracked_ignored/untracked_2 \
untracked_ignored/ignored_1.ign untracked_ignored/ignored_2.ign \
dir/untracked_ignored/untracked_1 dir/untracked_ignored/untracked_2 \
dir/untracked_ignored/ignored_1.ign dir/untracked_ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
test_cmp expect output
'
test_expect_success 'Verify status matching ignored files on ignored directory' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? expect
? output
! ignored_dir/
EOF
mkdir ignored_dir &&
touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
test_cmp expect output
'
test_expect_success 'Verify status behavior on ignored directory containing tracked file' '
test_when_finished "git clean -fdx && git reset HEAD~1 --hard" &&
cat >expect <<-\EOF &&
? expect
? output
! ignored_dir/ignored_1
! ignored_dir/ignored_1.ign
! ignored_dir/ignored_2
! ignored_dir/ignored_2.ign
EOF
mkdir ignored_dir &&
touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign \
ignored_dir/tracked &&
git add -f ignored_dir/tracked &&
git commit -m "Force add file in ignored directory" &&
git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
test_cmp expect output
'
test_expect_success 'Verify matching ignored files with --untracked-files=normal' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? expect
? output
? untracked_dir/
! ignored_dir/
! ignored_files/ignored_1.ign
! ignored_files/ignored_2.ign
EOF
mkdir ignored_dir ignored_files untracked_dir &&
touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
ignored_files/ignored_1.ign ignored_files/ignored_2.ign \
untracked_dir/untracked &&
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
test_cmp expect output
'
test_expect_success 'Verify matching ignored files with --untracked-files=normal' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? expect
? output
? untracked_dir/
! ignored_dir/
! ignored_files/ignored_1.ign
! ignored_files/ignored_2.ign
EOF
mkdir ignored_dir ignored_files untracked_dir &&
touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
ignored_files/ignored_1.ign ignored_files/ignored_2.ign \
untracked_dir/untracked &&
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
test_cmp expect output
'
test_expect_success 'Verify status behavior on ignored directory containing tracked file' '
test_when_finished "git clean -fdx && git reset HEAD~1 --hard" &&
cat >expect <<-\EOF &&
? expect
? output
! ignored_dir/ignored_1
! ignored_dir/ignored_1.ign
! ignored_dir/ignored_2
! ignored_dir/ignored_2.ign
EOF
mkdir ignored_dir &&
touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign \
ignored_dir/tracked &&
git add -f ignored_dir/tracked &&
git commit -m "Force add file in ignored directory" &&
git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
test_cmp expect output
'
test_expect_success 'Verify behavior of status with --ignored=no' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? expect
? output
EOF
mkdir -p ignored dir/ignored &&
touch ignored/ignored_1.ign ignored/ignored_2.ign \
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=no --untracked-files=all >output &&
test_cmp expect output
'
test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=all' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? expect
? output
! dir/ignored/ignored_1.ign
! dir/ignored/ignored_2.ign
! ignored/ignored_1.ign
! ignored/ignored_2.ign
EOF
mkdir -p ignored dir/ignored &&
touch ignored/ignored_1.ign ignored/ignored_2.ign \
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=traditional --untracked-files=all >output &&
test_cmp expect output
'
test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=normal' '
test_when_finished "git clean -fdx" &&
cat >expect <<-\EOF &&
? expect
? output
! dir/
! ignored/
EOF
mkdir -p ignored dir/ignored &&
touch ignored/ignored_1.ign ignored/ignored_2.ign \
dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
git status --porcelain=v2 --ignored=traditional --untracked-files=normal >output &&
test_cmp expect output
'
test_done
|
