1#!/bin/sh
2#
3# Copyright (c) 2006 Carl D. Worth
4#
5
6test_description='Test of the various options to git rm.'
7
8. ./test-lib.sh
9
10# Setup some files to be removed, some with funny characters
11test_expect_success \
12 'Initialize test directory' \
13 "touch -- foo bar baz 'space embedded' -q &&
14 git add -- foo bar baz 'space embedded' -q &&
15 git commit -m 'add normal files'"
16
17if touch -- 'tab embedded' 'newline
18embedded' 2>/dev/null
19then
20 test_set_prereq FUNNYNAMES
21else
22 say 'Your filesystem does not allow tabs in filenames.'
23fi
24
25test_expect_success FUNNYNAMES 'add files with funny names' "
26 git add -- 'tab embedded' 'newline
27embedded' &&
28 git commit -m 'add files with tabs and newlines'
29"
30
31test_expect_success \
32 'Pre-check that foo exists and is in index before git rm foo' \
33 '[ -f foo ] && git ls-files --error-unmatch foo'
34
35test_expect_success \
36 'Test that git rm foo succeeds' \
37 'git rm --cached foo'
38
39test_expect_success \
40 'Test that git rm --cached foo succeeds if the index matches the file' \
41 'echo content > foo
42 git add foo
43 git rm --cached foo'
44
45test_expect_success \
46 'Test that git rm --cached foo succeeds if the index matches the file' \
47 'echo content > foo
48 git add foo
49 git commit -m foo
50 echo "other content" > foo
51 git rm --cached foo'
52
53test_expect_success \
54 'Test that git rm --cached foo fails if the index matches neither the file nor HEAD' '
55 echo content > foo
56 git add foo
57 git commit -m foo
58 echo "other content" > foo
59 git add foo
60 echo "yet another content" > foo
61 test_must_fail git rm --cached foo
62'
63
64test_expect_success \
65 'Test that git rm --cached -f foo works in case where --cached only did not' \
66 'echo content > foo
67 git add foo
68 git commit -m foo
69 echo "other content" > foo
70 git add foo
71 echo "yet another content" > foo
72 git rm --cached -f foo'
73
74test_expect_success \
75 'Post-check that foo exists but is not in index after git rm foo' \
76 '[ -f foo ] && test_must_fail git ls-files --error-unmatch foo'
77
78test_expect_success \
79 'Pre-check that bar exists and is in index before "git rm bar"' \
80 '[ -f bar ] && git ls-files --error-unmatch bar'
81
82test_expect_success \
83 'Test that "git rm bar" succeeds' \
84 'git rm bar'
85
86test_expect_success \
87 'Post-check that bar does not exist and is not in index after "git rm -f bar"' \
88 '! [ -f bar ] && test_must_fail git ls-files --error-unmatch bar'
89
90test_expect_success \
91 'Test that "git rm -- -q" succeeds (remove a file that looks like an option)' \
92 'git rm -- -q'
93
94test_expect_success FUNNYNAMES \
95 "Test that \"git rm -f\" succeeds with embedded space, tab, or newline characters." \
96 "git rm -f 'space embedded' 'tab embedded' 'newline
97embedded'"
98
99test_expect_success SANITY 'Test that "git rm -f" fails if its rm fails' '
100 chmod a-w . &&
101 test_must_fail git rm -f baz &&
102 chmod 775 .
103'
104
105test_expect_success \
106 'When the rm in "git rm -f" fails, it should not remove the file from the index' \
107 'git ls-files --error-unmatch baz'
108
109test_expect_success 'Remove nonexistent file with --ignore-unmatch' '
110 git rm --ignore-unmatch nonexistent
111'
112
113test_expect_success '"rm" command printed' '
114 echo frotz > test-file &&
115 git add test-file &&
116 git commit -m "add file for rm test" &&
117 git rm test-file > rm-output &&
118 test `grep "^rm " rm-output | wc -l` = 1 &&
119 rm -f test-file rm-output &&
120 git commit -m "remove file from rm test"
121'
122
123test_expect_success '"rm" command suppressed with --quiet' '
124 echo frotz > test-file &&
125 git add test-file &&
126 git commit -m "add file for rm --quiet test" &&
127 git rm --quiet test-file > rm-output &&
128 test `wc -l < rm-output` = 0 &&
129 rm -f test-file rm-output &&
130 git commit -m "remove file from rm --quiet test"
131'
132
133# Now, failure cases.
134test_expect_success 'Re-add foo and baz' '
135 git add foo baz &&
136 git ls-files --error-unmatch foo baz
137'
138
139test_expect_success 'Modify foo -- rm should refuse' '
140 echo >>foo &&
141 test_must_fail git rm foo baz &&
142 test -f foo &&
143 test -f baz &&
144 git ls-files --error-unmatch foo baz
145'
146
147test_expect_success 'Modified foo -- rm -f should work' '
148 git rm -f foo baz &&
149 test ! -f foo &&
150 test ! -f baz &&
151 test_must_fail git ls-files --error-unmatch foo &&
152 test_must_fail git ls-files --error-unmatch bar
153'
154
155test_expect_success 'Re-add foo and baz for HEAD tests' '
156 echo frotz >foo &&
157 git checkout HEAD -- baz &&
158 git add foo baz &&
159 git ls-files --error-unmatch foo baz
160'
161
162test_expect_success 'foo is different in index from HEAD -- rm should refuse' '
163 test_must_fail git rm foo baz &&
164 test -f foo &&
165 test -f baz &&
166 git ls-files --error-unmatch foo baz
167'
168
169test_expect_success 'but with -f it should work.' '
170 git rm -f foo baz &&
171 test ! -f foo &&
172 test ! -f baz &&
173 test_must_fail git ls-files --error-unmatch foo
174 test_must_fail git ls-files --error-unmatch baz
175'
176
177test_expect_success 'refuse to remove cached empty file with modifications' '
178 >empty &&
179 git add empty &&
180 echo content >empty &&
181 test_must_fail git rm --cached empty
182'
183
184test_expect_success 'remove intent-to-add file without --force' '
185 echo content >intent-to-add &&
186 git add -N intent-to-add
187 git rm --cached intent-to-add
188'
189
190test_expect_success 'Recursive test setup' '
191 mkdir -p frotz &&
192 echo qfwfq >frotz/nitfol &&
193 git add frotz &&
194 git commit -m "subdir test"
195'
196
197test_expect_success 'Recursive without -r fails' '
198 test_must_fail git rm frotz &&
199 test -d frotz &&
200 test -f frotz/nitfol
201'
202
203test_expect_success 'Recursive with -r but dirty' '
204 echo qfwfq >>frotz/nitfol
205 test_must_fail git rm -r frotz &&
206 test -d frotz &&
207 test -f frotz/nitfol
208'
209
210test_expect_success 'Recursive with -r -f' '
211 git rm -f -r frotz &&
212 ! test -f frotz/nitfol &&
213 ! test -d frotz
214'
215
216test_expect_success 'Remove nonexistent file returns nonzero exit status' '
217 test_must_fail git rm nonexistent
218'
219
220test_expect_success 'Call "rm" from outside the work tree' '
221 mkdir repo &&
222 (cd repo &&
223 git init &&
224 echo something > somefile &&
225 git add somefile &&
226 git commit -m "add a file" &&
227 (cd .. &&
228 git --git-dir=repo/.git --work-tree=repo rm somefile) &&
229 test_must_fail git ls-files --error-unmatch somefile)
230'
231
232test_expect_success 'refresh index before checking if it is up-to-date' '
233
234 git reset --hard &&
235 test-chmtime -86400 frotz/nitfol &&
236 git rm frotz/nitfol &&
237 test ! -f frotz/nitfol
238
239'
240
241test_expect_success 'choking "git rm" should not let it die with cruft' '
242 git reset -q --hard &&
243 i=0 &&
244 while test $i -lt 12000
245 do
246 echo "100644 $_z40 0 some-file-$i"
247 i=$(( $i + 1 ))
248 done | git update-index --index-info &&
249 git rm -n "some-file-*" | :;
250 test -f .git/index.lock
251 status=$?
252 rm -f .git/index.lock
253 git reset -q --hard
254 test "$status" != 0
255'
256
257test_expect_success 'rm removes subdirectories recursively' '
258 mkdir -p dir/subdir/subsubdir &&
259 echo content >dir/subdir/subsubdir/file &&
260 git add dir/subdir/subsubdir/file &&
261 git rm -f dir/subdir/subsubdir/file &&
262 ! test -d dir
263'
264
265cat >expect <<EOF
266D submod
267EOF
268
269cat >expect.modified <<EOF
270 M submod
271EOF
272
273test_expect_success 'rm removes empty submodules from work tree' '
274 mkdir submod &&
275 git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) submod &&
276 git config -f .gitmodules submodule.sub.url ./. &&
277 git config -f .gitmodules submodule.sub.path submod &&
278 git submodule init &&
279 git add .gitmodules &&
280 git commit -m "add submodule" &&
281 git rm submod &&
282 test ! -e submod &&
283 git status -s -uno --ignore-submodules=none > actual &&
284 test_cmp expect actual
285'
286
287test_expect_success 'rm removes removed submodule from index' '
288 git reset --hard &&
289 git submodule update &&
290 rm -rf submod &&
291 git rm submod &&
292 git status -s -uno --ignore-submodules=none > actual &&
293 test_cmp expect actual
294'
295
296test_expect_success 'rm removes work tree of unmodified submodules' '
297 git reset --hard &&
298 git submodule update &&
299 git rm submod &&
300 test ! -d submod &&
301 git status -s -uno --ignore-submodules=none > actual &&
302 test_cmp expect actual
303'
304
305test_expect_success 'rm of a populated submodule with different HEAD fails unless forced' '
306 git reset --hard &&
307 git submodule update &&
308 (cd submod &&
309 git checkout HEAD^
310 ) &&
311 test_must_fail git rm submod &&
312 test -d submod &&
313 test -f submod/.git &&
314 git status -s -uno --ignore-submodules=none > actual &&
315 test_cmp expect.modified actual &&
316 git rm -f submod &&
317 test ! -d submod &&
318 git status -s -uno --ignore-submodules=none > actual &&
319 test_cmp expect actual
320'
321
322test_expect_success 'rm of a populated submodule with modifications fails unless forced' '
323 git reset --hard &&
324 git submodule update &&
325 (cd submod &&
326 echo X >empty
327 ) &&
328 test_must_fail git rm submod &&
329 test -d submod &&
330 test -f submod/.git &&
331 git status -s -uno --ignore-submodules=none > actual &&
332 test_cmp expect.modified actual &&
333 git rm -f submod &&
334 test ! -d submod &&
335 git status -s -uno --ignore-submodules=none > actual &&
336 test_cmp expect actual
337'
338
339test_expect_success 'rm of a populated submodule with untracked files fails unless forced' '
340 git reset --hard &&
341 git submodule update &&
342 (cd submod &&
343 echo X >untracked
344 ) &&
345 test_must_fail git rm submod &&
346 test -d submod &&
347 test -f submod/.git &&
348 git status -s -uno --ignore-submodules=none > actual &&
349 test_cmp expect.modified actual &&
350 git rm -f submod &&
351 test ! -d submod &&
352 git status -s -uno --ignore-submodules=none > actual &&
353 test_cmp expect actual
354'
355
356test_expect_success 'setup submodule conflict' '
357 git reset --hard &&
358 git submodule update &&
359 git checkout -b branch1 &&
360 echo 1 >nitfol &&
361 git add nitfol &&
362 git commit -m "added nitfol 1" &&
363 git checkout -b branch2 master &&
364 echo 2 >nitfol &&
365 git add nitfol &&
366 git commit -m "added nitfol 2" &&
367 git checkout -b conflict1 master &&
368 (cd submod &&
369 git fetch &&
370 git checkout branch1
371 ) &&
372 git add submod &&
373 git commit -m "submod 1" &&
374 git checkout -b conflict2 master &&
375 (cd submod &&
376 git checkout branch2
377 ) &&
378 git add submod &&
379 git commit -m "submod 2"
380'
381
382cat >expect.conflict <<EOF
383UU submod
384EOF
385
386test_expect_success 'rm removes work tree of unmodified conflicted submodule' '
387 git checkout conflict1 &&
388 git reset --hard &&
389 git submodule update &&
390 test_must_fail git merge conflict2 &&
391 git rm submod &&
392 test ! -d submod &&
393 git status -s -uno --ignore-submodules=none > actual &&
394 test_cmp expect actual
395'
396
397test_expect_success 'rm of a conflicted populated submodule with different HEAD fails unless forced' '
398 git checkout conflict1 &&
399 git reset --hard &&
400 git submodule update &&
401 (cd submod &&
402 git checkout HEAD^
403 ) &&
404 test_must_fail git merge conflict2 &&
405 test_must_fail git rm submod &&
406 test -d submod &&
407 test -f submod/.git &&
408 git status -s -uno --ignore-submodules=none > actual &&
409 test_cmp expect.conflict actual &&
410 git rm -f submod &&
411 test ! -d submod &&
412 git status -s -uno --ignore-submodules=none > actual &&
413 test_cmp expect actual
414'
415
416test_expect_success 'rm of a conflicted populated submodule with modifications fails unless forced' '
417 git checkout conflict1 &&
418 git reset --hard &&
419 git submodule update &&
420 (cd submod &&
421 echo X >empty
422 ) &&
423 test_must_fail git merge conflict2 &&
424 test_must_fail git rm submod &&
425 test -d submod &&
426 test -f submod/.git &&
427 git status -s -uno --ignore-submodules=none > actual &&
428 test_cmp expect.conflict actual &&
429 git rm -f submod &&
430 test ! -d submod &&
431 git status -s -uno --ignore-submodules=none > actual &&
432 test_cmp expect actual
433'
434
435test_expect_success 'rm of a conflicted populated submodule with untracked files fails unless forced' '
436 git checkout conflict1 &&
437 git reset --hard &&
438 git submodule update &&
439 (cd submod &&
440 echo X >untracked
441 ) &&
442 test_must_fail git merge conflict2 &&
443 test_must_fail git rm submod &&
444 test -d submod &&
445 test -f submod/.git &&
446 git status -s -uno --ignore-submodules=none > actual &&
447 test_cmp expect.conflict actual &&
448 git rm -f submod &&
449 test ! -d submod &&
450 git status -s -uno --ignore-submodules=none > actual &&
451 test_cmp expect actual
452'
453
454test_expect_success 'rm of a conflicted populated submodule with a .git directory fails even when forced' '
455 git checkout conflict1 &&
456 git reset --hard &&
457 git submodule update &&
458 (cd submod &&
459 rm .git &&
460 cp -a ../.git/modules/sub .git &&
461 GIT_WORK_TREE=. git config --unset core.worktree
462 ) &&
463 test_must_fail git merge conflict2 &&
464 test_must_fail git rm submod &&
465 test -d submod &&
466 test -d submod/.git &&
467 git status -s -uno --ignore-submodules=none > actual &&
468 test_cmp expect.conflict actual &&
469 test_must_fail git rm -f submod &&
470 test -d submod &&
471 test -d submod/.git &&
472 git status -s -uno --ignore-submodules=none > actual &&
473 test_cmp expect.conflict actual &&
474 git merge --abort &&
475 rm -rf submod
476'
477
478test_expect_success 'rm of a conflicted unpopulated submodule succeeds' '
479 git checkout conflict1 &&
480 git reset --hard &&
481 test_must_fail git merge conflict2 &&
482 git rm submod &&
483 test ! -d submod &&
484 git status -s -uno --ignore-submodules=none > actual &&
485 test_cmp expect actual
486'
487
488test_expect_success 'rm of a populated submodule with a .git directory fails even when forced' '
489 git checkout -f master &&
490 git reset --hard &&
491 git submodule update &&
492 (cd submod &&
493 rm .git &&
494 cp -a ../.git/modules/sub .git &&
495 GIT_WORK_TREE=. git config --unset core.worktree
496 ) &&
497 test_must_fail git rm submod &&
498 test -d submod &&
499 test -d submod/.git &&
500 git status -s -uno --ignore-submodules=none > actual &&
501 ! test -s actual &&
502 test_must_fail git rm -f submod &&
503 test -d submod &&
504 test -d submod/.git &&
505 git status -s -uno --ignore-submodules=none > actual &&
506 ! test -s actual &&
507 rm -rf submod
508'
509
510cat >expect.deepmodified <<EOF
511 M submod/subsubmod
512EOF
513
514test_expect_success 'setup subsubmodule' '
515 git reset --hard &&
516 git submodule update &&
517 (cd submod &&
518 git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) subsubmod &&
519 git config -f .gitmodules submodule.sub.url ../. &&
520 git config -f .gitmodules submodule.sub.path subsubmod &&
521 git submodule init &&
522 git add .gitmodules &&
523 git commit -m "add subsubmodule" &&
524 git submodule update subsubmod
525 ) &&
526 git commit -a -m "added deep submodule"
527'
528
529test_expect_success 'rm recursively removes work tree of unmodified submodules' '
530 git rm submod &&
531 test ! -d submod &&
532 git status -s -uno --ignore-submodules=none > actual &&
533 test_cmp expect actual
534'
535
536test_expect_success 'rm of a populated nested submodule with different nested HEAD fails unless forced' '
537 git reset --hard &&
538 git submodule update --recursive &&
539 (cd submod/subsubmod &&
540 git checkout HEAD^
541 ) &&
542 test_must_fail git rm submod &&
543 test -d submod &&
544 test -f submod/.git &&
545 git status -s -uno --ignore-submodules=none > actual &&
546 test_cmp expect.modified actual &&
547 git rm -f submod &&
548 test ! -d submod &&
549 git status -s -uno --ignore-submodules=none > actual &&
550 test_cmp expect actual
551'
552
553test_expect_success 'rm of a populated nested submodule with nested modifications fails unless forced' '
554 git reset --hard &&
555 git submodule update --recursive &&
556 (cd submod/subsubmod &&
557 echo X >empty
558 ) &&
559 test_must_fail git rm submod &&
560 test -d submod &&
561 test -f submod/.git &&
562 git status -s -uno --ignore-submodules=none > actual &&
563 test_cmp expect.modified actual &&
564 git rm -f submod &&
565 test ! -d submod &&
566 git status -s -uno --ignore-submodules=none > actual &&
567 test_cmp expect actual
568'
569
570test_expect_success 'rm of a populated nested submodule with nested untracked files fails unless forced' '
571 git reset --hard &&
572 git submodule update --recursive &&
573 (cd submod/subsubmod &&
574 echo X >untracked
575 ) &&
576 test_must_fail git rm submod &&
577 test -d submod &&
578 test -f submod/.git &&
579 git status -s -uno --ignore-submodules=none > actual &&
580 test_cmp expect.modified actual &&
581 git rm -f submod &&
582 test ! -d submod &&
583 git status -s -uno --ignore-submodules=none > actual &&
584 test_cmp expect actual
585'
586
587test_expect_success 'rm of a populated nested submodule with a nested .git directory fails even when forced' '
588 git reset --hard &&
589 git submodule update --recursive &&
590 (cd submod/subsubmod &&
591 rm .git &&
592 cp -a ../../.git/modules/sub/modules/sub .git &&
593 GIT_WORK_TREE=. git config --unset core.worktree
594 ) &&
595 test_must_fail git rm submod &&
596 test -d submod &&
597 test -d submod/subsubmod/.git &&
598 git status -s -uno --ignore-submodules=none > actual &&
599 ! test -s actual &&
600 test_must_fail git rm -f submod &&
601 test -d submod &&
602 test -d submod/subsubmod/.git &&
603 git status -s -uno --ignore-submodules=none > actual &&
604 ! test -s actual &&
605 rm -rf submod
606'
607
608test_done