]> git.ipfire.org Git - thirdparty/git.git/blame - t/t3600-rm.sh
.mailmap: fix erroneous authorship for Johannes Schindelin
[thirdparty/git.git] / t / t3600-rm.sh
CommitLineData
d4a1cab5
CW
1#!/bin/sh
2#
3# Copyright (c) 2006 Carl D. Worth
4#
5
5be60078 6test_description='Test of the various options to git rm.'
d4a1cab5
CW
7
8. ./test-lib.sh
9
3844cdc8 10# Setup some files to be removed, some with funny characters
b5368c23
RA
11test_expect_success 'Initialize test directory' '
12 touch -- foo bar baz "space embedded" -q &&
13 git add -- foo bar baz "space embedded" -q &&
14 git commit -m "add normal files"
15'
56e78bfb 16
b5368c23
RA
17if test_have_prereq !FUNNYNAMES
18then
56e78bfb
JS
19 say 'Your filesystem does not allow tabs in filenames.'
20fi
21
b5368c23
RA
22test_expect_success FUNNYNAMES 'add files with funny names' '
23 touch -- "tab embedded" "newline${LF}embedded" &&
24 git add -- "tab embedded" "newline${LF}embedded" &&
25 git commit -m "add files with tabs and newlines"
26'
27
28test_expect_success 'Pre-check that foo exists and is in index before git rm foo' '
59a06e94 29 test_path_is_file foo &&
b5368c23
RA
30 git ls-files --error-unmatch foo
31'
32
33test_expect_success 'Test that git rm foo succeeds' '
34 git rm --cached foo
35'
36
37test_expect_success 'Test that git rm --cached foo succeeds if the index matches the file' '
38 echo content >foo &&
39 git add foo &&
40 git rm --cached foo
41'
42
43test_expect_success 'Test that git rm --cached foo succeeds if the index matches the file' '
44 echo content >foo &&
45 git add foo &&
46 git commit -m foo &&
47 echo "other content" >foo &&
48 git rm --cached foo
49'
50
51test_expect_success 'Test that git rm --cached foo fails if the index matches neither the file nor HEAD' '
52 echo content >foo &&
53 git add foo &&
54 git commit -m foo --allow-empty &&
55 echo "other content" >foo &&
56 git add foo &&
57 echo "yet another content" >foo &&
58 test_must_fail git rm --cached foo
59'
60
61test_expect_success 'Test that git rm --cached -f foo works in case where --cached only did not' '
62 echo content >foo &&
63 git add foo &&
64 git commit -m foo --allow-empty &&
65 echo "other content" >foo &&
66 git add foo &&
67 echo "yet another content" >foo &&
68 git rm --cached -f foo
69'
70
71test_expect_success 'Post-check that foo exists but is not in index after git rm foo' '
59a06e94 72 test_path_is_file foo &&
b5368c23
RA
73 test_must_fail git ls-files --error-unmatch foo
74'
75
76test_expect_success 'Pre-check that bar exists and is in index before "git rm bar"' '
59a06e94 77 test_path_is_file bar &&
b5368c23
RA
78 git ls-files --error-unmatch bar
79'
80
81test_expect_success 'Test that "git rm bar" succeeds' '
82 git rm bar
83'
84
85test_expect_success 'Post-check that bar does not exist and is not in index after "git rm -f bar"' '
59a06e94 86 test_path_is_missing bar &&
b5368c23
RA
87 test_must_fail git ls-files --error-unmatch bar
88'
89
90test_expect_success 'Test that "git rm -- -q" succeeds (remove a file that looks like an option)' '
91 git rm -- -q
92'
93
94test_expect_success FUNNYNAMES 'Test that "git rm -f" succeeds with embedded space, tab, or newline characters.' '
95 git rm -f "space embedded" "tab embedded" "newline${LF}embedded"
96'
3844cdc8 97
fbbfc8a9 98test_expect_success SANITY 'Test that "git rm -f" fails if its rm fails' '
23739aa2 99 test_when_finished "chmod 775 ." &&
56e78bfb 100 chmod a-w . &&
23739aa2 101 test_must_fail git rm -f baz
56e78bfb 102'
3844cdc8 103
b5368c23
RA
104test_expect_success 'When the rm in "git rm -f" fails, it should not remove the file from the index' '
105 git ls-files --error-unmatch baz
106'
3844cdc8 107
bb1faf0d
SG
108test_expect_success 'Remove nonexistent file with --ignore-unmatch' '
109 git rm --ignore-unmatch nonexistent
110'
111
b48caa20 112test_expect_success '"rm" command printed' '
9e189f1a 113 echo frotz >test-file &&
b48caa20
SG
114 git add test-file &&
115 git commit -m "add file for rm test" &&
0d913dfa
DL
116 git rm test-file >rm-output.raw &&
117 grep "^rm " rm-output.raw >rm-output &&
118 test_line_count = 1 rm-output &&
119 rm -f test-file rm-output.raw rm-output &&
b48caa20
SG
120 git commit -m "remove file from rm test"
121'
122
123test_expect_success '"rm" command suppressed with --quiet' '
9e189f1a 124 echo frotz >test-file &&
b48caa20
SG
125 git add test-file &&
126 git commit -m "add file for rm --quiet test" &&
9e189f1a
SB
127 git rm --quiet test-file >rm-output &&
128 test_must_be_empty rm-output &&
b48caa20
SG
129 rm -f test-file rm-output &&
130 git commit -m "remove file from rm --quiet test"
131'
132
467e1b53
JH
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 &&
d492b31c 141 test_must_fail git rm foo baz &&
59a06e94
RA
142 test_path_is_file foo &&
143 test_path_is_file baz &&
467e1b53
JH
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 &&
59a06e94
RA
149 test_path_is_missing foo &&
150 test_path_is_missing baz &&
d492b31c
SB
151 test_must_fail git ls-files --error-unmatch foo &&
152 test_must_fail git ls-files --error-unmatch bar
467e1b53
JH
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' '
d492b31c 163 test_must_fail git rm foo baz &&
59a06e94
RA
164 test_path_is_file foo &&
165 test_path_is_file baz &&
467e1b53
JH
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 &&
59a06e94
RA
171 test_path_is_missing foo &&
172 test_path_is_missing baz &&
8fb26872 173 test_must_fail git ls-files --error-unmatch foo &&
d492b31c 174 test_must_fail git ls-files --error-unmatch baz
467e1b53
JH
175'
176
388b2acd
JH
177test_expect_success 'refuse to remove cached empty file with modifications' '
178 >empty &&
f55527f8
JK
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 &&
99094a7a 186 git add -N intent-to-add &&
f55527f8
JK
187 git rm --cached intent-to-add
188'
189
467e1b53
JH
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' '
d492b31c 198 test_must_fail git rm frotz &&
59a06e94
RA
199 test_path_is_dir frotz &&
200 test_path_is_file frotz/nitfol
467e1b53
JH
201'
202
203test_expect_success 'Recursive with -r but dirty' '
99094a7a 204 echo qfwfq >>frotz/nitfol &&
d492b31c 205 test_must_fail git rm -r frotz &&
59a06e94
RA
206 test_path_is_dir frotz &&
207 test_path_is_file frotz/nitfol
467e1b53
JH
208'
209
210test_expect_success 'Recursive with -r -f' '
211 git rm -f -r frotz &&
59a06e94
RA
212 test_path_is_missing frotz/nitfol &&
213 test_path_is_missing frotz
467e1b53
JH
214'
215
41ac414e 216test_expect_success 'Remove nonexistent file returns nonzero exit status' '
d492b31c 217 test_must_fail git rm nonexistent
b48caa20
SG
218'
219
4d264672
OM
220test_expect_success 'Call "rm" from outside the work tree' '
221 mkdir repo &&
b5368c23
RA
222 (
223 cd repo &&
224 git init &&
225 echo something >somefile &&
226 git add somefile &&
227 git commit -m "add a file" &&
228 (
229 cd .. &&
230 git --git-dir=repo/.git --work-tree=repo rm somefile
231 ) &&
232 test_must_fail git ls-files --error-unmatch somefile
233 )
cced48a8
JS
234'
235
236test_expect_success 'refresh index before checking if it is up-to-date' '
cced48a8 237 git reset --hard &&
0e496492 238 test-tool chmtime -86400 frotz/nitfol &&
cced48a8 239 git rm frotz/nitfol &&
59a06e94 240 test_path_is_missing frotz/nitfol
4d264672
OM
241'
242
0693f9dd 243test_expect_success 'choking "git rm" should not let it die with cruft' '
ca6ba942 244 test_oid_init &&
0693f9dd 245 git reset -q --hard &&
056f34bb 246 test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
0693f9dd 247 i=0 &&
ca6ba942 248 hash=$(test_oid deadbeef) &&
0693f9dd
JH
249 while test $i -lt 12000
250 do
ca6ba942 251 echo "100644 $hash 0 some-file-$i"
b5368c23 252 i=$(( $i + 1 ))
0693f9dd 253 done | git update-index --index-info &&
50cd31c6 254 # git command is intentionally placed upstream of pipe to induce SIGPIPE
056f34bb
SG
255 git rm -n "some-file-*" | : &&
256 test_path_is_missing .git/index.lock
0693f9dd
JH
257'
258
b2b1f615
JH
259test_expect_success 'Resolving by removal is not a warning-worthy event' '
260 git reset -q --hard &&
261 test_when_finished "rm -f .git/index.lock msg && git reset -q --hard" &&
262 blob=$(echo blob | git hash-object -w --stdin) &&
263 for stage in 1 2 3
264 do
265 echo "100644 $blob $stage blob"
266 done | git update-index --index-info &&
267 git rm blob >msg 2>&1 &&
268 test_i18ngrep ! "needs merge" msg &&
269 test_must_fail git ls-files -s --error-unmatch blob
270'
271
3fc0d131
JK
272test_expect_success 'rm removes subdirectories recursively' '
273 mkdir -p dir/subdir/subsubdir &&
274 echo content >dir/subdir/subsubdir/file &&
275 git add dir/subdir/subsubdir/file &&
276 git rm -f dir/subdir/subsubdir/file &&
59a06e94 277 test_path_is_missing dir
3fc0d131
JK
278'
279
293ab15e 280cat >expect <<EOF
95c16418 281M .gitmodules
293ab15e
JL
282D submod
283EOF
284
285cat >expect.modified <<EOF
286 M submod
287EOF
288
dd6962dd
SB
289cat >expect.modified_inside <<EOF
290 m submod
291EOF
292
293cat >expect.modified_untracked <<EOF
294 ? submod
295EOF
296
95c16418
JL
297cat >expect.cached <<EOF
298D submod
299EOF
300
301cat >expect.both_deleted<<EOF
302D .gitmodules
303D submod
304EOF
305
293ab15e
JL
306test_expect_success 'rm removes empty submodules from work tree' '
307 mkdir submod &&
3b737381
DL
308 hash=$(git rev-parse HEAD) &&
309 git update-index --add --cacheinfo 160000 "$hash" submod &&
293ab15e
JL
310 git config -f .gitmodules submodule.sub.url ./. &&
311 git config -f .gitmodules submodule.sub.path submod &&
312 git submodule init &&
313 git add .gitmodules &&
314 git commit -m "add submodule" &&
315 git rm submod &&
59a06e94 316 test_path_is_missing submod &&
9e189f1a 317 git status -s -uno --ignore-submodules=none >actual &&
95c16418
JL
318 test_cmp expect actual &&
319 test_must_fail git config -f .gitmodules submodule.sub.url &&
320 test_must_fail git config -f .gitmodules submodule.sub.path
293ab15e
JL
321'
322
95c16418 323test_expect_success 'rm removes removed submodule from index and .gitmodules' '
293ab15e
JL
324 git reset --hard &&
325 git submodule update &&
326 rm -rf submod &&
327 git rm submod &&
9e189f1a 328 git status -s -uno --ignore-submodules=none >actual &&
95c16418
JL
329 test_cmp expect actual &&
330 test_must_fail git config -f .gitmodules submodule.sub.url &&
331 test_must_fail git config -f .gitmodules submodule.sub.path
293ab15e
JL
332'
333
334test_expect_success 'rm removes work tree of unmodified submodules' '
335 git reset --hard &&
336 git submodule update &&
337 git rm submod &&
59a06e94 338 test_path_is_missing submod &&
9e189f1a 339 git status -s -uno --ignore-submodules=none >actual &&
95c16418
JL
340 test_cmp expect actual &&
341 test_must_fail git config -f .gitmodules submodule.sub.url &&
342 test_must_fail git config -f .gitmodules submodule.sub.path
293ab15e
JL
343'
344
53e4c5dc
JL
345test_expect_success 'rm removes a submodule with a trailing /' '
346 git reset --hard &&
347 git submodule update &&
348 git rm submod/ &&
59a06e94 349 test_path_is_missing submod &&
9e189f1a 350 git status -s -uno --ignore-submodules=none >actual &&
53e4c5dc
JL
351 test_cmp expect actual
352'
353
354test_expect_success 'rm fails when given a file with a trailing /' '
355 test_must_fail git rm empty/
356'
357
358test_expect_success 'rm succeeds when given a directory with a trailing /' '
359 git rm -r frotz/
360'
361
293ab15e
JL
362test_expect_success 'rm of a populated submodule with different HEAD fails unless forced' '
363 git reset --hard &&
364 git submodule update &&
9e189f1a 365 git -C submod checkout HEAD^ &&
293ab15e 366 test_must_fail git rm submod &&
59a06e94
RA
367 test_path_is_dir submod &&
368 test_path_is_file submod/.git &&
9e189f1a 369 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
370 test_cmp expect.modified actual &&
371 git rm -f submod &&
59a06e94 372 test_path_is_missing submod &&
9e189f1a 373 git status -s -uno --ignore-submodules=none >actual &&
95c16418
JL
374 test_cmp expect actual &&
375 test_must_fail git config -f .gitmodules submodule.sub.url &&
376 test_must_fail git config -f .gitmodules submodule.sub.path
377'
378
379test_expect_success 'rm --cached leaves work tree of populated submodules and .gitmodules alone' '
380 git reset --hard &&
381 git submodule update &&
382 git rm --cached submod &&
59a06e94
RA
383 test_path_is_dir submod &&
384 test_path_is_file submod/.git &&
95c16418
JL
385 git status -s -uno >actual &&
386 test_cmp expect.cached actual &&
387 git config -f .gitmodules submodule.sub.url &&
388 git config -f .gitmodules submodule.sub.path
389'
390
391test_expect_success 'rm --dry-run does not touch the submodule or .gitmodules' '
392 git reset --hard &&
393 git submodule update &&
394 git rm -n submod &&
59a06e94 395 test_path_is_file submod/.git &&
95c16418
JL
396 git diff-index --exit-code HEAD
397'
398
399test_expect_success 'rm does not complain when no .gitmodules file is found' '
400 git reset --hard &&
401 git submodule update &&
402 git rm .gitmodules &&
403 git rm submod >actual 2>actual.err &&
ec10b018 404 test_must_be_empty actual.err &&
59a06e94
RA
405 test_path_is_missing submod &&
406 test_path_is_missing submod/.git &&
95c16418
JL
407 git status -s -uno >actual &&
408 test_cmp expect.both_deleted actual
409'
410
411test_expect_success 'rm will error out on a modified .gitmodules file unless staged' '
412 git reset --hard &&
413 git submodule update &&
414 git config -f .gitmodules foo.bar true &&
415 test_must_fail git rm submod >actual 2>actual.err &&
59a06e94
RA
416 test_file_not_empty actual.err &&
417 test_path_is_dir submod &&
418 test_path_is_file submod/.git &&
95c16418
JL
419 git diff-files --quiet -- submod &&
420 git add .gitmodules &&
421 git rm submod >actual 2>actual.err &&
ec10b018 422 test_must_be_empty actual.err &&
59a06e94
RA
423 test_path_is_missing submod &&
424 test_path_is_missing submod/.git &&
95c16418
JL
425 git status -s -uno >actual &&
426 test_cmp expect actual
427'
428
429test_expect_success 'rm issues a warning when section is not found in .gitmodules' '
430 git reset --hard &&
431 git submodule update &&
432 git config -f .gitmodules --remove-section submodule.sub &&
433 git add .gitmodules &&
434 echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
435 git rm submod >actual 2>actual.err &&
436 test_i18ncmp expect.err actual.err &&
59a06e94
RA
437 test_path_is_missing submod &&
438 test_path_is_missing submod/.git &&
95c16418 439 git status -s -uno >actual &&
293ab15e
JL
440 test_cmp expect actual
441'
442
443test_expect_success 'rm of a populated submodule with modifications fails unless forced' '
444 git reset --hard &&
445 git submodule update &&
9e189f1a 446 echo X >submod/empty &&
293ab15e 447 test_must_fail git rm submod &&
59a06e94
RA
448 test_path_is_dir submod &&
449 test_path_is_file submod/.git &&
9e189f1a 450 git status -s -uno --ignore-submodules=none >actual &&
dd6962dd 451 test_cmp expect.modified_inside actual &&
293ab15e 452 git rm -f submod &&
59a06e94 453 test_path_is_missing submod &&
9e189f1a 454 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
455 test_cmp expect actual
456'
457
458test_expect_success 'rm of a populated submodule with untracked files fails unless forced' '
459 git reset --hard &&
460 git submodule update &&
9e189f1a 461 echo X >submod/untracked &&
293ab15e 462 test_must_fail git rm submod &&
59a06e94
RA
463 test_path_is_dir submod &&
464 test_path_is_file submod/.git &&
9e189f1a 465 git status -s -uno --ignore-submodules=none >actual &&
dd6962dd 466 test_cmp expect.modified_untracked actual &&
293ab15e 467 git rm -f submod &&
59a06e94 468 test_path_is_missing submod &&
9e189f1a 469 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
470 test_cmp expect actual
471'
472
473test_expect_success 'setup submodule conflict' '
474 git reset --hard &&
475 git submodule update &&
476 git checkout -b branch1 &&
477 echo 1 >nitfol &&
478 git add nitfol &&
479 git commit -m "added nitfol 1" &&
480 git checkout -b branch2 master &&
481 echo 2 >nitfol &&
482 git add nitfol &&
483 git commit -m "added nitfol 2" &&
484 git checkout -b conflict1 master &&
9e189f1a
SB
485 git -C submod fetch &&
486 git -C submod checkout branch1 &&
293ab15e
JL
487 git add submod &&
488 git commit -m "submod 1" &&
489 git checkout -b conflict2 master &&
9e189f1a 490 git -C submod checkout branch2 &&
293ab15e
JL
491 git add submod &&
492 git commit -m "submod 2"
493'
494
495cat >expect.conflict <<EOF
496UU submod
497EOF
498
499test_expect_success 'rm removes work tree of unmodified conflicted submodule' '
500 git checkout conflict1 &&
501 git reset --hard &&
502 git submodule update &&
503 test_must_fail git merge conflict2 &&
504 git rm submod &&
59a06e94 505 test_path_is_missing submod &&
9e189f1a 506 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
507 test_cmp expect actual
508'
509
510test_expect_success 'rm of a conflicted populated submodule with different HEAD fails unless forced' '
511 git checkout conflict1 &&
512 git reset --hard &&
513 git submodule update &&
9e189f1a 514 git -C submod checkout HEAD^ &&
293ab15e
JL
515 test_must_fail git merge conflict2 &&
516 test_must_fail git rm submod &&
59a06e94
RA
517 test_path_is_dir submod &&
518 test_path_is_file submod/.git &&
9e189f1a 519 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
520 test_cmp expect.conflict actual &&
521 git rm -f submod &&
59a06e94 522 test_path_is_missing submod &&
9e189f1a 523 git status -s -uno --ignore-submodules=none >actual &&
95c16418
JL
524 test_cmp expect actual &&
525 test_must_fail git config -f .gitmodules submodule.sub.url &&
526 test_must_fail git config -f .gitmodules submodule.sub.path
293ab15e
JL
527'
528
529test_expect_success 'rm of a conflicted populated submodule with modifications fails unless forced' '
530 git checkout conflict1 &&
531 git reset --hard &&
532 git submodule update &&
9e189f1a 533 echo X >submod/empty &&
293ab15e
JL
534 test_must_fail git merge conflict2 &&
535 test_must_fail git rm submod &&
59a06e94
RA
536 test_path_is_dir submod &&
537 test_path_is_file submod/.git &&
9e189f1a 538 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
539 test_cmp expect.conflict actual &&
540 git rm -f submod &&
59a06e94 541 test_path_is_missing submod &&
9e189f1a 542 git status -s -uno --ignore-submodules=none >actual &&
95c16418
JL
543 test_cmp expect actual &&
544 test_must_fail git config -f .gitmodules submodule.sub.url &&
545 test_must_fail git config -f .gitmodules submodule.sub.path
293ab15e
JL
546'
547
548test_expect_success 'rm of a conflicted populated submodule with untracked files fails unless forced' '
549 git checkout conflict1 &&
550 git reset --hard &&
551 git submodule update &&
9e189f1a 552 echo X >submod/untracked &&
293ab15e
JL
553 test_must_fail git merge conflict2 &&
554 test_must_fail git rm submod &&
59a06e94
RA
555 test_path_is_dir submod &&
556 test_path_is_file submod/.git &&
9e189f1a 557 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
558 test_cmp expect.conflict actual &&
559 git rm -f submod &&
59a06e94 560 test_path_is_missing submod &&
9e189f1a 561 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
562 test_cmp expect actual
563'
564
565test_expect_success 'rm of a conflicted populated submodule with a .git directory fails even when forced' '
566 git checkout conflict1 &&
567 git reset --hard &&
568 git submodule update &&
b5368c23
RA
569 (
570 cd submod &&
293ab15e 571 rm .git &&
2d3ac9ad 572 cp -R ../.git/modules/sub .git &&
293ab15e
JL
573 GIT_WORK_TREE=. git config --unset core.worktree
574 ) &&
575 test_must_fail git merge conflict2 &&
576 test_must_fail git rm submod &&
59a06e94
RA
577 test_path_is_dir submod &&
578 test_path_is_dir submod/.git &&
9e189f1a 579 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
580 test_cmp expect.conflict actual &&
581 test_must_fail git rm -f submod &&
59a06e94
RA
582 test_path_is_dir submod &&
583 test_path_is_dir submod/.git &&
9e189f1a 584 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
585 test_cmp expect.conflict actual &&
586 git merge --abort &&
587 rm -rf submod
588'
589
590test_expect_success 'rm of a conflicted unpopulated submodule succeeds' '
591 git checkout conflict1 &&
592 git reset --hard &&
593 test_must_fail git merge conflict2 &&
594 git rm submod &&
59a06e94 595 test_path_is_missing submod &&
9e189f1a 596 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
597 test_cmp expect actual
598'
599
55856a35 600test_expect_success 'rm of a populated submodule with a .git directory migrates git dir' '
293ab15e
JL
601 git checkout -f master &&
602 git reset --hard &&
603 git submodule update &&
b5368c23
RA
604 (
605 cd submod &&
293ab15e 606 rm .git &&
2d3ac9ad 607 cp -R ../.git/modules/sub .git &&
55856a35
SB
608 GIT_WORK_TREE=. git config --unset core.worktree &&
609 rm -r ../.git/modules/sub
293ab15e 610 ) &&
55856a35 611 git rm submod 2>output.err &&
59a06e94
RA
612 test_path_is_missing submod &&
613 test_path_is_missing submod/.git &&
9e189f1a 614 git status -s -uno --ignore-submodules=none >actual &&
59a06e94 615 test_file_not_empty actual &&
55856a35 616 test_i18ngrep Migrating output.err
293ab15e
JL
617'
618
619cat >expect.deepmodified <<EOF
620 M submod/subsubmod
621EOF
622
623test_expect_success 'setup subsubmodule' '
624 git reset --hard &&
625 git submodule update &&
b5368c23
RA
626 (
627 cd submod &&
3b737381
DL
628 hash=$(git rev-parse HEAD) &&
629 git update-index --add --cacheinfo 160000 "$hash" subsubmod &&
293ab15e
JL
630 git config -f .gitmodules submodule.sub.url ../. &&
631 git config -f .gitmodules submodule.sub.path subsubmod &&
632 git submodule init &&
633 git add .gitmodules &&
634 git commit -m "add subsubmodule" &&
635 git submodule update subsubmod
636 ) &&
637 git commit -a -m "added deep submodule"
638'
639
640test_expect_success 'rm recursively removes work tree of unmodified submodules' '
641 git rm submod &&
59a06e94 642 test_path_is_missing submod &&
9e189f1a 643 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
644 test_cmp expect actual
645'
646
647test_expect_success 'rm of a populated nested submodule with different nested HEAD fails unless forced' '
648 git reset --hard &&
649 git submodule update --recursive &&
9e189f1a 650 git -C submod/subsubmod checkout HEAD^ &&
293ab15e 651 test_must_fail git rm submod &&
59a06e94
RA
652 test_path_is_dir submod &&
653 test_path_is_file submod/.git &&
9e189f1a 654 git status -s -uno --ignore-submodules=none >actual &&
dd6962dd 655 test_cmp expect.modified_inside actual &&
293ab15e 656 git rm -f submod &&
59a06e94 657 test_path_is_missing submod &&
9e189f1a 658 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
659 test_cmp expect actual
660'
661
662test_expect_success 'rm of a populated nested submodule with nested modifications fails unless forced' '
663 git reset --hard &&
664 git submodule update --recursive &&
9e189f1a 665 echo X >submod/subsubmod/empty &&
293ab15e 666 test_must_fail git rm submod &&
59a06e94
RA
667 test_path_is_dir submod &&
668 test_path_is_file submod/.git &&
9e189f1a 669 git status -s -uno --ignore-submodules=none >actual &&
dd6962dd 670 test_cmp expect.modified_inside actual &&
293ab15e 671 git rm -f submod &&
59a06e94 672 test_path_is_missing submod &&
9e189f1a 673 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
674 test_cmp expect actual
675'
676
677test_expect_success 'rm of a populated nested submodule with nested untracked files fails unless forced' '
678 git reset --hard &&
679 git submodule update --recursive &&
9e189f1a 680 echo X >submod/subsubmod/untracked &&
293ab15e 681 test_must_fail git rm submod &&
59a06e94
RA
682 test_path_is_dir submod &&
683 test_path_is_file submod/.git &&
9e189f1a 684 git status -s -uno --ignore-submodules=none >actual &&
40069d6e 685 test_cmp expect.modified_untracked actual &&
293ab15e 686 git rm -f submod &&
59a06e94 687 test_path_is_missing submod &&
9e189f1a 688 git status -s -uno --ignore-submodules=none >actual &&
293ab15e
JL
689 test_cmp expect actual
690'
691
70471ed9 692test_expect_success "rm absorbs submodule's nested .git directory" '
293ab15e
JL
693 git reset --hard &&
694 git submodule update --recursive &&
b5368c23
RA
695 (
696 cd submod/subsubmod &&
293ab15e 697 rm .git &&
55856a35 698 mv ../../.git/modules/sub/modules/sub .git &&
293ab15e
JL
699 GIT_WORK_TREE=. git config --unset core.worktree
700 ) &&
55856a35 701 git rm submod 2>output.err &&
59a06e94
RA
702 test_path_is_missing submod &&
703 test_path_is_missing submod/subsubmod/.git &&
9e189f1a 704 git status -s -uno --ignore-submodules=none >actual &&
59a06e94 705 test_file_not_empty actual &&
55856a35 706 test_i18ngrep Migrating output.err
293ab15e
JL
707'
708
bbad9f93 709test_expect_success 'checking out a commit after submodule removal needs manual updates' '
55856a35 710 git commit -m "submodule removal" submod .gitmodules &&
bbad9f93
JL
711 git checkout HEAD^ &&
712 git submodule update &&
8954bd76 713 git checkout -q HEAD^ &&
bbad9f93 714 git checkout -q master 2>actual &&
0a288d1e 715 test_i18ngrep "^warning: unable to rmdir '\''submod'\'':" actual &&
bbad9f93
JL
716 git status -s submod >actual &&
717 echo "?? submod/" >expected &&
718 test_cmp expected actual &&
719 rm -rf submod &&
9e189f1a 720 git status -s -uno --ignore-submodules=none >actual &&
ec10b018 721 test_must_be_empty actual
bbad9f93
JL
722'
723
9a6728d4
JK
724test_expect_success 'rm of d/f when d has become a non-directory' '
725 rm -rf d &&
726 mkdir d &&
727 >d/f &&
728 git add d &&
729 rm -rf d &&
730 >d &&
731 git rm d/f &&
732 test_must_fail git rev-parse --verify :d/f &&
733 test_path_is_file d
734'
735
736test_expect_success SYMLINKS 'rm of d/f when d has become a dangling symlink' '
737 rm -rf d &&
738 mkdir d &&
739 >d/f &&
740 git add d &&
741 rm -rf d &&
742 ln -s nonexistent d &&
743 git rm d/f &&
744 test_must_fail git rev-parse --verify :d/f &&
745 test -h d &&
746 test_path_is_missing d
747'
748
96ec8ee9
JK
749test_expect_success 'rm of file when it has become a directory' '
750 rm -rf d &&
751 >d &&
752 git add d &&
753 rm -f d &&
754 mkdir d &&
755 >d/f &&
756 test_must_fail git rm d &&
757 git rev-parse --verify :d &&
758 test_path_is_file d/f
759'
760
03415ca8
JK
761test_expect_success SYMLINKS 'rm across a symlinked leading path (no index)' '
762 rm -rf d e &&
763 mkdir e &&
764 echo content >e/f &&
765 ln -s e d &&
766 git add -A e d &&
767 git commit -m "symlink d to e, e/f exists" &&
768 test_must_fail git rm d/f &&
769 git rev-parse --verify :d &&
770 git rev-parse --verify :e/f &&
771 test -h d &&
772 test_path_is_file e/f
773'
774
775test_expect_failure SYMLINKS 'rm across a symlinked leading path (w/ index)' '
776 rm -rf d e &&
777 mkdir d &&
778 echo content >d/f &&
779 git add -A e d &&
780 git commit -m "d/f exists" &&
781 mv d e &&
782 ln -s e d &&
783 test_must_fail git rm d/f &&
784 git rev-parse --verify :d/f &&
785 test -h d &&
786 test_path_is_file e/f
787'
788
914dc028
MLM
789test_expect_success 'setup for testing rm messages' '
790 >bar.txt &&
791 >foo.txt &&
792 git add bar.txt foo.txt
793'
794
795test_expect_success 'rm files with different staged content' '
796 cat >expect <<-\EOF &&
797 error: the following files have staged content different from both the
798 file and the HEAD:
799 bar.txt
800 foo.txt
801 (use -f to force removal)
802 EOF
803 echo content1 >foo.txt &&
804 echo content1 >bar.txt &&
805 test_must_fail git rm foo.txt bar.txt 2>actual &&
806 test_i18ncmp expect actual
807'
808
7e309446
MLM
809test_expect_success 'rm files with different staged content without hints' '
810 cat >expect <<-\EOF &&
811 error: the following files have staged content different from both the
812 file and the HEAD:
813 bar.txt
814 foo.txt
815 EOF
816 echo content2 >foo.txt &&
817 echo content2 >bar.txt &&
818 test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt 2>actual &&
819 test_i18ncmp expect actual
820'
914dc028
MLM
821
822test_expect_success 'rm file with local modification' '
823 cat >expect <<-\EOF &&
824 error: the following file has local modifications:
825 foo.txt
826 (use --cached to keep the file, or -f to force removal)
827 EOF
828 git commit -m "testing rm 3" &&
829 echo content3 >foo.txt &&
830 test_must_fail git rm foo.txt 2>actual &&
831 test_i18ncmp expect actual
832'
833
7e309446
MLM
834test_expect_success 'rm file with local modification without hints' '
835 cat >expect <<-\EOF &&
836 error: the following file has local modifications:
837 bar.txt
838 EOF
839 echo content4 >bar.txt &&
840 test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual &&
841 test_i18ncmp expect actual
842'
914dc028
MLM
843
844test_expect_success 'rm file with changes in the index' '
845 cat >expect <<-\EOF &&
846 error: the following file has changes staged in the index:
847 foo.txt
848 (use --cached to keep the file, or -f to force removal)
849 EOF
850 git reset --hard &&
851 echo content5 >foo.txt &&
852 git add foo.txt &&
853 test_must_fail git rm foo.txt 2>actual &&
854 test_i18ncmp expect actual
855'
856
7e309446
MLM
857test_expect_success 'rm file with changes in the index without hints' '
858 cat >expect <<-\EOF &&
859 error: the following file has changes staged in the index:
860 foo.txt
861 EOF
862 test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual &&
863 test_i18ncmp expect actual
864'
914dc028
MLM
865
866test_expect_success 'rm files with two different errors' '
867 cat >expect <<-\EOF &&
868 error: the following file has staged content different from both the
869 file and the HEAD:
870 foo1.txt
871 (use -f to force removal)
872 error: the following file has changes staged in the index:
873 bar1.txt
874 (use --cached to keep the file, or -f to force removal)
875 EOF
876 echo content >foo1.txt &&
877 git add foo1.txt &&
878 echo content6 >foo1.txt &&
879 echo content6 >bar1.txt &&
880 git add bar1.txt &&
881 test_must_fail git rm bar1.txt foo1.txt 2>actual &&
882 test_i18ncmp expect actual
883'
884
9e4e8a64
EX
885test_expect_success 'rm empty string should fail' '
886 test_must_fail git rm -rf ""
d426430e
EX
887'
888
d4a1cab5 889test_done