blob: cada952f9aee35fe795af5cd99af222f1a8b599f (
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
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
|
#!/bin/sh
test_description='test case exclude pathspec'
. ./test-lib.sh
test_expect_success 'setup' '
for p in file sub/file sub/sub/file sub/file2 sub/sub/sub/file sub2/file; do
if echo $p | grep /; then
mkdir -p $(dirname $p)
fi &&
: >$p &&
git add $p &&
git commit -m $p || return 1
done &&
git log --oneline --format=%s >actual &&
cat <<EOF >expect &&
sub2/file
sub/sub/sub/file
sub/file2
sub/sub/file
sub/file
file
EOF
test_cmp expect actual
'
test_expect_success 'exclude only pathspec uses default implicit pathspec' '
git log --oneline --format=%s -- . ":(exclude)sub" >expect &&
git log --oneline --format=%s -- ":(exclude)sub" >actual &&
test_cmp expect actual
'
test_expect_success 't_e_i() exclude sub' '
git log --oneline --format=%s -- . ":(exclude)sub" >actual &&
cat <<EOF >expect &&
sub2/file
file
EOF
test_cmp expect actual
'
test_expect_success 't_e_i() exclude sub/sub/file' '
git log --oneline --format=%s -- . ":(exclude)sub/sub/file" >actual &&
cat <<EOF >expect &&
sub2/file
sub/sub/sub/file
sub/file2
sub/file
file
EOF
test_cmp expect actual
'
test_expect_success 't_e_i() exclude sub using mnemonic' '
git log --oneline --format=%s -- . ":!sub" >actual &&
cat <<EOF >expect &&
sub2/file
file
EOF
test_cmp expect actual
'
test_expect_success 't_e_i() exclude :(icase)SUB' '
git log --oneline --format=%s -- . ":(exclude,icase)SUB" >actual &&
cat <<EOF >expect &&
sub2/file
file
EOF
test_cmp expect actual
'
test_expect_success 't_e_i() exclude sub2 from sub' '
(
cd sub &&
git log --oneline --format=%s -- :/ ":/!sub2" >actual &&
cat <<EOF >expect &&
sub/sub/sub/file
sub/file2
sub/sub/file
sub/file
file
EOF
test_cmp expect actual
)
'
test_expect_success 't_e_i() exclude sub/*file' '
git log --oneline --format=%s -- . ":(exclude)sub/*file" >actual &&
cat <<EOF >expect &&
sub2/file
sub/file2
file
EOF
test_cmp expect actual
'
test_expect_success 't_e_i() exclude :(glob)sub/*/file' '
git log --oneline --format=%s -- . ":(exclude,glob)sub/*/file" >actual &&
cat <<EOF >expect &&
sub2/file
sub/sub/sub/file
sub/file2
sub/file
file
EOF
test_cmp expect actual
'
test_expect_success 'm_p_d() exclude sub' '
git ls-files -- . ":(exclude)sub" >actual &&
cat <<EOF >expect &&
file
sub2/file
EOF
test_cmp expect actual
'
test_expect_success 'm_p_d() exclude sub/sub/file' '
git ls-files -- . ":(exclude)sub/sub/file" >actual &&
cat <<EOF >expect &&
file
sub/file
sub/file2
sub/sub/sub/file
sub2/file
EOF
test_cmp expect actual
'
test_expect_success 'm_p_d() exclude sub using mnemonic' '
git ls-files -- . ":!sub" >actual &&
cat <<EOF >expect &&
file
sub2/file
EOF
test_cmp expect actual
'
test_expect_success 'm_p_d() exclude :(icase)SUB' '
git ls-files -- . ":(exclude,icase)SUB" >actual &&
cat <<EOF >expect &&
file
sub2/file
EOF
test_cmp expect actual
'
test_expect_success 'm_p_d() exclude sub2 from sub' '
(
cd sub &&
git ls-files -- :/ ":/!sub2" >actual &&
cat <<EOF >expect &&
../file
file
file2
sub/file
sub/sub/file
EOF
test_cmp expect actual
)
'
test_expect_success 'm_p_d() exclude sub/*file' '
git ls-files -- . ":(exclude)sub/*file" >actual &&
cat <<EOF >expect &&
file
sub/file2
sub2/file
EOF
test_cmp expect actual
'
test_expect_success 'm_p_d() exclude :(glob)sub/*/file' '
git ls-files -- . ":(exclude,glob)sub/*/file" >actual &&
cat <<EOF >expect &&
file
sub/file
sub/file2
sub/sub/sub/file
sub2/file
EOF
test_cmp expect actual
'
test_expect_success 'multiple exclusions' '
git ls-files -- ":^*/file2" ":^sub2" >actual &&
cat <<-\EOF >expect &&
file
sub/file
sub/sub/file
sub/sub/sub/file
EOF
test_cmp expect actual
'
test_expect_success 't_e_i() exclude case #8' '
test_when_finished "rm -fr case8" &&
git init case8 &&
(
cd case8 &&
echo file >file1 &&
echo file >file2 &&
git add file1 file2 &&
git commit -m twofiles &&
git grep -l file HEAD :^file2 >actual &&
echo HEAD:file1 >expected &&
test_cmp expected actual &&
git grep -l file HEAD :^file1 >actual &&
echo HEAD:file2 >expected &&
test_cmp expected actual
)
'
test_expect_success 'grep --untracked PATTERN' '
# This test is not an actual test of exclude patterns, rather it
# is here solely to ensure that if any tests are inserted, deleted, or
# changed above, that we still have untracked files with the expected
# contents for the NEXT two tests.
cat <<-\EOF >expect-grep &&
actual
expect
sub/actual
sub/expect
EOF
git grep -l --untracked file -- >actual-grep &&
test_cmp expect-grep actual-grep
'
test_expect_success 'grep --untracked PATTERN :(exclude)DIR' '
cat <<-\EOF >expect-grep &&
actual
expect
EOF
git grep -l --untracked file -- ":(exclude)sub" >actual-grep &&
test_cmp expect-grep actual-grep
'
test_expect_success 'grep --untracked PATTERN :(exclude)*FILE' '
cat <<-\EOF >expect-grep &&
actual
sub/actual
EOF
git grep -l --untracked file -- ":(exclude)*expect" >actual-grep &&
test_cmp expect-grep actual-grep
'
# Depending on the command, all negative pathspec needs to subtract
# either from the full tree, or from the current directory.
#
# The sample tree checked out at this point has:
# file
# sub/file
# sub/file2
# sub/sub/file
# sub/sub/sub/file
# sub2/file
#
# but there may also be some cruft that interferes with "git clean"
# and "git add" tests.
test_expect_success 'archive with all negative' '
git reset --hard &&
git clean -f &&
git -C sub archive --format=tar HEAD -- ":!sub/" >archive &&
"$TAR" tf archive >actual &&
cat >expect <<-\EOF &&
file
file2
EOF
test_cmp expect actual
'
test_expect_success 'add with all negative' '
H=$(git rev-parse HEAD) &&
git reset --hard $H &&
git clean -f &&
test_when_finished "git reset --hard $H" &&
for path in file sub/file sub/sub/file sub2/file
do
echo smudge >>"$path" || return 1
done &&
git -C sub add -- ":!sub/" &&
git diff --name-only --no-renames --cached >actual &&
cat >expect <<-\EOF &&
file
sub/file
sub2/file
EOF
test_cmp expect actual &&
git diff --name-only --no-renames >actual &&
echo sub/sub/file >expect &&
test_cmp expect actual
'
test_lazy_prereq ADD_I_USE_BUILTIN_OR_PERL '
test_have_prereq ADD_I_USE_BUILTIN || test_have_prereq PERL
'
test_expect_success ADD_I_USE_BUILTIN_OR_PERL 'add -p with all negative' '
H=$(git rev-parse HEAD) &&
git reset --hard $H &&
git clean -f &&
test_when_finished "git reset --hard $H" &&
for path in file sub/file sub/sub/file sub2/file
do
echo smudge >>"$path" || return 1
done &&
yes | git -C sub add -p -- ":!sub/" &&
git diff --name-only --no-renames --cached >actual &&
cat >expect <<-\EOF &&
file
sub/file
sub2/file
EOF
test_cmp expect actual &&
git diff --name-only --no-renames >actual &&
echo sub/sub/file >expect &&
test_cmp expect actual
'
test_expect_success 'clean with all negative' '
H=$(git rev-parse HEAD) &&
git reset --hard $H &&
test_when_finished "git reset --hard $H && git clean -f" &&
git clean -f &&
for path in file9 sub/file9 sub/sub/file9 sub2/file9
do
echo cruft >"$path" || return 1
done &&
git -C sub clean -f -- ":!sub" &&
test_path_is_file file9 &&
test_path_is_missing sub/file9 &&
test_path_is_file sub/sub/file9 &&
test_path_is_file sub2/file9
'
test_expect_success 'commit with all negative' '
H=$(git rev-parse HEAD) &&
git reset --hard $H &&
test_when_finished "git reset --hard $H" &&
for path in file sub/file sub/sub/file sub2/file
do
echo smudge >>"$path" || return 1
done &&
git -C sub commit -m sample -- ":!sub/" &&
git diff --name-only --no-renames HEAD^ HEAD >actual &&
cat >expect <<-\EOF &&
file
sub/file
sub2/file
EOF
test_cmp expect actual &&
git diff --name-only --no-renames HEAD >actual &&
echo sub/sub/file >expect &&
test_cmp expect actual
'
test_expect_success 'reset with all negative' '
H=$(git rev-parse HEAD) &&
git reset --hard $H &&
test_when_finished "git reset --hard $H" &&
for path in file sub/file sub/sub/file sub2/file
do
echo smudge >>"$path" &&
git add "$path" || return 1
done &&
git -C sub reset --quiet -- ":!sub/" &&
git diff --name-only --no-renames --cached >actual &&
echo sub/sub/file >expect &&
test_cmp expect actual
'
test_expect_success 'grep with all negative' '
H=$(git rev-parse HEAD) &&
git reset --hard $H &&
test_when_finished "git reset --hard $H" &&
for path in file sub/file sub/sub/file sub2/file
do
echo "needle $path" >>"$path" || return 1
done &&
git -C sub grep -h needle -- ":!sub/" >actual &&
cat >expect <<-\EOF &&
needle sub/file
EOF
test_cmp expect actual
'
test_expect_success 'ls-files with all negative' '
git reset --hard &&
git -C sub ls-files -- ":!sub/" >actual &&
cat >expect <<-\EOF &&
file
file2
EOF
test_cmp expect actual
'
test_expect_success 'rm with all negative' '
git reset --hard &&
test_when_finished "git reset --hard" &&
git -C sub rm -r --cached -- ":!sub/" >actual &&
git diff --name-only --no-renames --diff-filter=D --cached >actual &&
cat >expect <<-\EOF &&
sub/file
sub/file2
EOF
test_cmp expect actual
'
test_expect_success 'stash with all negative' '
H=$(git rev-parse HEAD) &&
git reset --hard $H &&
test_when_finished "git reset --hard $H" &&
for path in file sub/file sub/sub/file sub2/file
do
echo smudge >>"$path" || return 1
done &&
git -C sub stash push -m sample -- ":!sub/" &&
git diff --name-only --no-renames HEAD >actual &&
echo sub/sub/file >expect &&
test_cmp expect actual &&
git stash show --name-only >actual &&
cat >expect <<-\EOF &&
file
sub/file
sub2/file
EOF
test_cmp expect actual
'
test_done
|