t/t3600-rm.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2006 Carl D. Worth
   4 #
   5
   6 test_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
  11 test_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 '
  16
  17 if test_have_prereq !FUNNYNAMES
  18 then
  19         say 'Your filesystem does not allow tabs in filenames.'
  20 fi
  21
  22 test_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
  28 test_expect_success 'Pre-check that foo exists and is in index before git rm foo' '
  29         test_path_is_file foo &&
  30         git ls-files --error-unmatch foo
  31 '
  32
  33 test_expect_success 'Test that git rm foo succeeds' '
  34         git rm --cached foo
  35 '
  36
  37 test_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
  43 test_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
  51 test_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
  61 test_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
  71 test_expect_success 'Post-check that foo exists but is not in index after git rm foo' '
  72         test_path_is_file foo &&
  73         test_must_fail git ls-files --error-unmatch foo
  74 '
  75
  76 test_expect_success 'Pre-check that bar exists and is in index before "git rm bar"' '
  77         test_path_is_file bar &&
  78         git ls-files --error-unmatch bar
  79 '
  80
  81 test_expect_success 'Test that "git rm bar" succeeds' '
  82         git rm bar
  83 '
  84
  85 test_expect_success 'Post-check that bar does not exist and is not in index after "git rm -f bar"' '
  86         test_path_is_missing bar &&
  87         test_must_fail git ls-files --error-unmatch bar
  88 '
  89
  90 test_expect_success 'Test that "git rm -- -q" succeeds (remove a file that looks like an option)' '
  91         git rm -- -q
  92 '
  93
  94 test_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 '
  97
  98 test_expect_success SANITY 'Test that "git rm -f" fails if its rm fails' '
  99         test_when_finished "chmod 775 ." &&
 100         chmod a-w . &&
 101         test_must_fail git rm -f baz
 102 '
 103
 104 test_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 '
 107
 108 test_expect_success 'Remove nonexistent file with --ignore-unmatch' '
 109         git rm --ignore-unmatch nonexistent
 110 '
 111
 112 test_expect_success '"rm" command printed' '
 113         echo frotz >test-file &&
 114         git add test-file &&
 115         git commit -m "add file for rm test" &&
 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 &&
 120         git commit -m "remove file from rm test"
 121 '
 122
 123 test_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_must_be_empty rm-output &&
 129         rm -f test-file rm-output &&
 130         git commit -m "remove file from rm --quiet test"
 131 '
 132
 133 # Now, failure cases.
 134 test_expect_success 'Re-add foo and baz' '
 135         git add foo baz &&
 136         git ls-files --error-unmatch foo baz
 137 '
 138
 139 test_expect_success 'Modify foo -- rm should refuse' '
 140         echo >>foo &&
 141         test_must_fail git rm foo baz &&
 142         test_path_is_file foo &&
 143         test_path_is_file baz &&
 144         git ls-files --error-unmatch foo baz
 145 '
 146
 147 test_expect_success 'Modified foo -- rm -f should work' '
 148         git rm -f foo baz &&
 149         test_path_is_missing foo &&
 150         test_path_is_missing baz &&
 151         test_must_fail git ls-files --error-unmatch foo &&
 152         test_must_fail git ls-files --error-unmatch bar
 153 '
 154
 155 test_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
 162 test_expect_success 'foo is different in index from HEAD -- rm should refuse' '
 163         test_must_fail git rm foo baz &&
 164         test_path_is_file foo &&
 165         test_path_is_file baz &&
 166         git ls-files --error-unmatch foo baz
 167 '
 168
 169 test_expect_success 'but with -f it should work.' '
 170         git rm -f foo baz &&
 171         test_path_is_missing foo &&
 172         test_path_is_missing baz &&
 173         test_must_fail git ls-files --error-unmatch foo &&
 174         test_must_fail git ls-files --error-unmatch baz
 175 '
 176
 177 test_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
 184 test_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
 190 test_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
 197 test_expect_success 'Recursive without -r fails' '
 198         test_must_fail git rm frotz &&
 199         test_path_is_dir frotz &&
 200         test_path_is_file frotz/nitfol
 201 '
 202
 203 test_expect_success 'Recursive with -r but dirty' '
 204         echo qfwfq >>frotz/nitfol &&
 205         test_must_fail git rm -r frotz &&
 206         test_path_is_dir frotz &&
 207         test_path_is_file frotz/nitfol
 208 '
 209
 210 test_expect_success 'Recursive with -r -f' '
 211         git rm -f -r frotz &&
 212         test_path_is_missing frotz/nitfol &&
 213         test_path_is_missing frotz
 214 '
 215
 216 test_expect_success 'Remove nonexistent file returns nonzero exit status' '
 217         test_must_fail git rm nonexistent
 218 '
 219
 220 test_expect_success 'Call "rm" from outside the work tree' '
 221         mkdir repo &&
 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         )
 234 '
 235
 236 test_expect_success 'refresh index before checking if it is up-to-date' '
 237         git reset --hard &&
 238         test-tool chmtime -86400 frotz/nitfol &&
 239         git rm frotz/nitfol &&
 240         test_path_is_missing frotz/nitfol
 241 '
 242
 243 test_expect_success 'choking "git rm" should not let it die with cruft' '
 244         test_oid_init &&
 245         git reset -q --hard &&
 246         test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
 247         i=0 &&
 248         hash=$(test_oid deadbeef) &&
 249         while test $i -lt 12000
 250         do
 251                 echo "100644 $hash 0    some-file-$i"
 252                 i=$(( $i + 1 ))
 253         done | git update-index --index-info &&
 254         # git command is intentionally placed upstream of pipe to induce SIGPIPE
 255         git rm -n "some-file-*" | : &&
 256         test_path_is_missing .git/index.lock
 257 '
 258
 259 test_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
 272 test_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 &&
 277         test_path_is_missing dir
 278 '
 279
 280 cat >expect <<EOF
 281 M  .gitmodules
 282 D  submod
 283 EOF
 284
 285 cat >expect.modified <<EOF
 286  M submod
 287 EOF
 288
 289 cat >expect.modified_inside <<EOF
 290  m submod
 291 EOF
 292
 293 cat >expect.modified_untracked <<EOF
 294  ? submod
 295 EOF
 296
 297 cat >expect.cached <<EOF
 298 D  submod
 299 EOF
 300
 301 cat >expect.both_deleted<<EOF
 302 D  .gitmodules
 303 D  submod
 304 EOF
 305
 306 test_expect_success 'rm removes empty submodules from work tree' '
 307         mkdir submod &&
 308         hash=$(git rev-parse HEAD) &&
 309         git update-index --add --cacheinfo 160000 "$hash" submod &&
 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 &&
 316         test_path_is_missing submod &&
 317         git status -s -uno --ignore-submodules=none >actual &&
 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
 321 '
 322
 323 test_expect_success 'rm removes removed submodule from index and .gitmodules' '
 324         git reset --hard &&
 325         git submodule update &&
 326         rm -rf submod &&
 327         git rm submod &&
 328         git status -s -uno --ignore-submodules=none >actual &&
 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
 332 '
 333
 334 test_expect_success 'rm removes work tree of unmodified submodules' '
 335         git reset --hard &&
 336         git submodule update &&
 337         git rm submod &&
 338         test_path_is_missing submod &&
 339         git status -s -uno --ignore-submodules=none >actual &&
 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
 343 '
 344
 345 test_expect_success 'rm removes a submodule with a trailing /' '
 346         git reset --hard &&
 347         git submodule update &&
 348         git rm submod/ &&
 349         test_path_is_missing submod &&
 350         git status -s -uno --ignore-submodules=none >actual &&
 351         test_cmp expect actual
 352 '
 353
 354 test_expect_success 'rm fails when given a file with a trailing /' '
 355         test_must_fail git rm empty/
 356 '
 357
 358 test_expect_success 'rm succeeds when given a directory with a trailing /' '
 359         git rm -r frotz/
 360 '
 361
 362 test_expect_success 'rm of a populated submodule with different HEAD fails unless forced' '
 363         git reset --hard &&
 364         git submodule update &&
 365         git -C submod checkout HEAD^ &&
 366         test_must_fail git rm submod &&
 367         test_path_is_dir submod &&
 368         test_path_is_file submod/.git &&
 369         git status -s -uno --ignore-submodules=none >actual &&
 370         test_cmp expect.modified actual &&
 371         git rm -f submod &&
 372         test_path_is_missing submod &&
 373         git status -s -uno --ignore-submodules=none >actual &&
 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
 379 test_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 &&
 383         test_path_is_dir submod &&
 384         test_path_is_file submod/.git &&
 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
 391 test_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 &&
 395         test_path_is_file submod/.git &&
 396         git diff-index --exit-code HEAD
 397 '
 398
 399 test_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 &&
 404         test_must_be_empty actual.err &&
 405         test_path_is_missing submod &&
 406         test_path_is_missing submod/.git &&
 407         git status -s -uno >actual &&
 408         test_cmp expect.both_deleted actual
 409 '
 410
 411 test_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 &&
 416         test_file_not_empty actual.err &&
 417         test_path_is_dir submod &&
 418         test_path_is_file submod/.git &&
 419         git diff-files --quiet -- submod &&
 420         git add .gitmodules &&
 421         git rm submod >actual 2>actual.err &&
 422         test_must_be_empty actual.err &&
 423         test_path_is_missing submod &&
 424         test_path_is_missing submod/.git &&
 425         git status -s -uno >actual &&
 426         test_cmp expect actual
 427 '
 428 test_expect_success 'rm will not error out on .gitmodules file with zero stat data' '
 429         git reset --hard &&
 430         git submodule update &&
 431         git read-tree HEAD &&
 432         git rm submod &&
 433         test_path_is_missing submod
 434 '
 435
 436 test_expect_success 'rm issues a warning when section is not found in .gitmodules' '
 437         git reset --hard &&
 438         git submodule update &&
 439         git config -f .gitmodules --remove-section submodule.sub &&
 440         git add .gitmodules &&
 441         echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
 442         git rm submod >actual 2>actual.err &&
 443         test_i18ncmp expect.err actual.err &&
 444         test_path_is_missing submod &&
 445         test_path_is_missing submod/.git &&
 446         git status -s -uno >actual &&
 447         test_cmp expect actual
 448 '
 449
 450 test_expect_success 'rm of a populated submodule with modifications fails unless forced' '
 451         git reset --hard &&
 452         git submodule update &&
 453         echo X >submod/empty &&
 454         test_must_fail git rm submod &&
 455         test_path_is_dir submod &&
 456         test_path_is_file submod/.git &&
 457         git status -s -uno --ignore-submodules=none >actual &&
 458         test_cmp expect.modified_inside actual &&
 459         git rm -f submod &&
 460         test_path_is_missing submod &&
 461         git status -s -uno --ignore-submodules=none >actual &&
 462         test_cmp expect actual
 463 '
 464
 465 test_expect_success 'rm of a populated submodule with untracked files fails unless forced' '
 466         git reset --hard &&
 467         git submodule update &&
 468         echo X >submod/untracked &&
 469         test_must_fail git rm submod &&
 470         test_path_is_dir submod &&
 471         test_path_is_file submod/.git &&
 472         git status -s -uno --ignore-submodules=none >actual &&
 473         test_cmp expect.modified_untracked actual &&
 474         git rm -f submod &&
 475         test_path_is_missing submod &&
 476         git status -s -uno --ignore-submodules=none >actual &&
 477         test_cmp expect actual
 478 '
 479
 480 test_expect_success 'setup submodule conflict' '
 481         git reset --hard &&
 482         git submodule update &&
 483         git checkout -b branch1 &&
 484         echo 1 >nitfol &&
 485         git add nitfol &&
 486         git commit -m "added nitfol 1" &&
 487         git checkout -b branch2 master &&
 488         echo 2 >nitfol &&
 489         git add nitfol &&
 490         git commit -m "added nitfol 2" &&
 491         git checkout -b conflict1 master &&
 492         git -C submod fetch &&
 493         git -C submod checkout branch1 &&
 494         git add submod &&
 495         git commit -m "submod 1" &&
 496         git checkout -b conflict2 master &&
 497         git -C submod checkout branch2 &&
 498         git add submod &&
 499         git commit -m "submod 2"
 500 '
 501
 502 cat >expect.conflict <<EOF
 503 UU submod
 504 EOF
 505
 506 test_expect_success 'rm removes work tree of unmodified conflicted submodule' '
 507         git checkout conflict1 &&
 508         git reset --hard &&
 509         git submodule update &&
 510         test_must_fail git merge conflict2 &&
 511         git rm submod &&
 512         test_path_is_missing submod &&
 513         git status -s -uno --ignore-submodules=none >actual &&
 514         test_cmp expect actual
 515 '
 516
 517 test_expect_success 'rm of a conflicted populated submodule with different HEAD fails unless forced' '
 518         git checkout conflict1 &&
 519         git reset --hard &&
 520         git submodule update &&
 521         git -C submod checkout HEAD^ &&
 522         test_must_fail git merge conflict2 &&
 523         test_must_fail git rm submod &&
 524         test_path_is_dir submod &&
 525         test_path_is_file submod/.git &&
 526         git status -s -uno --ignore-submodules=none >actual &&
 527         test_cmp expect.conflict actual &&
 528         git rm -f submod &&
 529         test_path_is_missing submod &&
 530         git status -s -uno --ignore-submodules=none >actual &&
 531         test_cmp expect actual &&
 532         test_must_fail git config -f .gitmodules submodule.sub.url &&
 533         test_must_fail git config -f .gitmodules submodule.sub.path
 534 '
 535
 536 test_expect_success 'rm of a conflicted populated submodule with modifications fails unless forced' '
 537         git checkout conflict1 &&
 538         git reset --hard &&
 539         git submodule update &&
 540         echo X >submod/empty &&
 541         test_must_fail git merge conflict2 &&
 542         test_must_fail git rm submod &&
 543         test_path_is_dir submod &&
 544         test_path_is_file submod/.git &&
 545         git status -s -uno --ignore-submodules=none >actual &&
 546         test_cmp expect.conflict actual &&
 547         git rm -f submod &&
 548         test_path_is_missing submod &&
 549         git status -s -uno --ignore-submodules=none >actual &&
 550         test_cmp expect actual &&
 551         test_must_fail git config -f .gitmodules submodule.sub.url &&
 552         test_must_fail git config -f .gitmodules submodule.sub.path
 553 '
 554
 555 test_expect_success 'rm of a conflicted populated submodule with untracked files fails unless forced' '
 556         git checkout conflict1 &&
 557         git reset --hard &&
 558         git submodule update &&
 559         echo X >submod/untracked &&
 560         test_must_fail git merge conflict2 &&
 561         test_must_fail git rm submod &&
 562         test_path_is_dir submod &&
 563         test_path_is_file submod/.git &&
 564         git status -s -uno --ignore-submodules=none >actual &&
 565         test_cmp expect.conflict actual &&
 566         git rm -f submod &&
 567         test_path_is_missing submod &&
 568         git status -s -uno --ignore-submodules=none >actual &&
 569         test_cmp expect actual
 570 '
 571
 572 test_expect_success 'rm of a conflicted populated submodule with a .git directory fails even when forced' '
 573         git checkout conflict1 &&
 574         git reset --hard &&
 575         git submodule update &&
 576         (
 577                 cd submod &&
 578                 rm .git &&
 579                 cp -R ../.git/modules/sub .git &&
 580                 GIT_WORK_TREE=. git config --unset core.worktree
 581         ) &&
 582         test_must_fail git merge conflict2 &&
 583         test_must_fail git rm submod &&
 584         test_path_is_dir submod &&
 585         test_path_is_dir submod/.git &&
 586         git status -s -uno --ignore-submodules=none >actual &&
 587         test_cmp expect.conflict actual &&
 588         test_must_fail git rm -f submod &&
 589         test_path_is_dir submod &&
 590         test_path_is_dir submod/.git &&
 591         git status -s -uno --ignore-submodules=none >actual &&
 592         test_cmp expect.conflict actual &&
 593         git merge --abort &&
 594         rm -rf submod
 595 '
 596
 597 test_expect_success 'rm of a conflicted unpopulated submodule succeeds' '
 598         git checkout conflict1 &&
 599         git reset --hard &&
 600         test_must_fail git merge conflict2 &&
 601         git rm submod &&
 602         test_path_is_missing submod &&
 603         git status -s -uno --ignore-submodules=none >actual &&
 604         test_cmp expect actual
 605 '
 606
 607 test_expect_success 'rm of a populated submodule with a .git directory migrates git dir' '
 608         git checkout -f master &&
 609         git reset --hard &&
 610         git submodule update &&
 611         (
 612                 cd submod &&
 613                 rm .git &&
 614                 cp -R ../.git/modules/sub .git &&
 615                 GIT_WORK_TREE=. git config --unset core.worktree &&
 616                 rm -r ../.git/modules/sub
 617         ) &&
 618         git rm submod 2>output.err &&
 619         test_path_is_missing submod &&
 620         test_path_is_missing submod/.git &&
 621         git status -s -uno --ignore-submodules=none >actual &&
 622         test_file_not_empty actual &&
 623         test_i18ngrep Migrating output.err
 624 '
 625
 626 cat >expect.deepmodified <<EOF
 627  M submod/subsubmod
 628 EOF
 629
 630 test_expect_success 'setup subsubmodule' '
 631         git reset --hard &&
 632         git submodule update &&
 633         (
 634                 cd submod &&
 635                 hash=$(git rev-parse HEAD) &&
 636                 git update-index --add --cacheinfo 160000 "$hash" subsubmod &&
 637                 git config -f .gitmodules submodule.sub.url ../. &&
 638                 git config -f .gitmodules submodule.sub.path subsubmod &&
 639                 git submodule init &&
 640                 git add .gitmodules &&
 641                 git commit -m "add subsubmodule" &&
 642                 git submodule update subsubmod
 643         ) &&
 644         git commit -a -m "added deep submodule"
 645 '
 646
 647 test_expect_success 'rm recursively removes work tree of unmodified submodules' '
 648         git rm submod &&
 649         test_path_is_missing submod &&
 650         git status -s -uno --ignore-submodules=none >actual &&
 651         test_cmp expect actual
 652 '
 653
 654 test_expect_success 'rm of a populated nested submodule with different nested HEAD fails unless forced' '
 655         git reset --hard &&
 656         git submodule update --recursive &&
 657         git -C submod/subsubmod checkout HEAD^ &&
 658         test_must_fail git rm submod &&
 659         test_path_is_dir submod &&
 660         test_path_is_file submod/.git &&
 661         git status -s -uno --ignore-submodules=none >actual &&
 662         test_cmp expect.modified_inside actual &&
 663         git rm -f submod &&
 664         test_path_is_missing submod &&
 665         git status -s -uno --ignore-submodules=none >actual &&
 666         test_cmp expect actual
 667 '
 668
 669 test_expect_success 'rm of a populated nested submodule with nested modifications fails unless forced' '
 670         git reset --hard &&
 671         git submodule update --recursive &&
 672         echo X >submod/subsubmod/empty &&
 673         test_must_fail git rm submod &&
 674         test_path_is_dir submod &&
 675         test_path_is_file submod/.git &&
 676         git status -s -uno --ignore-submodules=none >actual &&
 677         test_cmp expect.modified_inside actual &&
 678         git rm -f submod &&
 679         test_path_is_missing submod &&
 680         git status -s -uno --ignore-submodules=none >actual &&
 681         test_cmp expect actual
 682 '
 683
 684 test_expect_success 'rm of a populated nested submodule with nested untracked files fails unless forced' '
 685         git reset --hard &&
 686         git submodule update --recursive &&
 687         echo X >submod/subsubmod/untracked &&
 688         test_must_fail git rm submod &&
 689         test_path_is_dir submod &&
 690         test_path_is_file submod/.git &&
 691         git status -s -uno --ignore-submodules=none >actual &&
 692         test_cmp expect.modified_untracked actual &&
 693         git rm -f submod &&
 694         test_path_is_missing submod &&
 695         git status -s -uno --ignore-submodules=none >actual &&
 696         test_cmp expect actual
 697 '
 698
 699 test_expect_success "rm absorbs submodule's nested .git directory" '
 700         git reset --hard &&
 701         git submodule update --recursive &&
 702         (
 703                 cd submod/subsubmod &&
 704                 rm .git &&
 705                 mv ../../.git/modules/sub/modules/sub .git &&
 706                 GIT_WORK_TREE=. git config --unset core.worktree
 707         ) &&
 708         git rm submod 2>output.err &&
 709         test_path_is_missing submod &&
 710         test_path_is_missing submod/subsubmod/.git &&
 711         git status -s -uno --ignore-submodules=none >actual &&
 712         test_file_not_empty actual &&
 713         test_i18ngrep Migrating output.err
 714 '
 715
 716 test_expect_success 'checking out a commit after submodule removal needs manual updates' '
 717         git commit -m "submodule removal" submod .gitmodules &&
 718         git checkout HEAD^ &&
 719         git submodule update &&
 720         git checkout -q HEAD^ &&
 721         git checkout -q master 2>actual &&
 722         test_i18ngrep "^warning: unable to rmdir '\''submod'\'':" actual &&
 723         git status -s submod >actual &&
 724         echo "?? submod/" >expected &&
 725         test_cmp expected actual &&
 726         rm -rf submod &&
 727         git status -s -uno --ignore-submodules=none >actual &&
 728         test_must_be_empty actual
 729 '
 730
 731 test_expect_success 'rm of d/f when d has become a non-directory' '
 732         rm -rf d &&
 733         mkdir d &&
 734         >d/f &&
 735         git add d &&
 736         rm -rf d &&
 737         >d &&
 738         git rm d/f &&
 739         test_must_fail git rev-parse --verify :d/f &&
 740         test_path_is_file d
 741 '
 742
 743 test_expect_success SYMLINKS 'rm of d/f when d has become a dangling symlink' '
 744         rm -rf d &&
 745         mkdir d &&
 746         >d/f &&
 747         git add d &&
 748         rm -rf d &&
 749         ln -s nonexistent d &&
 750         git rm d/f &&
 751         test_must_fail git rev-parse --verify :d/f &&
 752         test -h d &&
 753         test_path_is_missing d
 754 '
 755
 756 test_expect_success 'rm of file when it has become a directory' '
 757         rm -rf d &&
 758         >d &&
 759         git add d &&
 760         rm -f d &&
 761         mkdir d &&
 762         >d/f &&
 763         test_must_fail git rm d &&
 764         git rev-parse --verify :d &&
 765         test_path_is_file d/f
 766 '
 767
 768 test_expect_success SYMLINKS 'rm across a symlinked leading path (no index)' '
 769         rm -rf d e &&
 770         mkdir e &&
 771         echo content >e/f &&
 772         ln -s e d &&
 773         git add -A e d &&
 774         git commit -m "symlink d to e, e/f exists" &&
 775         test_must_fail git rm d/f &&
 776         git rev-parse --verify :d &&
 777         git rev-parse --verify :e/f &&
 778         test -h d &&
 779         test_path_is_file e/f
 780 '
 781
 782 test_expect_failure SYMLINKS 'rm across a symlinked leading path (w/ index)' '
 783         rm -rf d e &&
 784         mkdir d &&
 785         echo content >d/f &&
 786         git add -A e d &&
 787         git commit -m "d/f exists" &&
 788         mv d e &&
 789         ln -s e d &&
 790         test_must_fail git rm d/f &&
 791         git rev-parse --verify :d/f &&
 792         test -h d &&
 793         test_path_is_file e/f
 794 '
 795
 796 test_expect_success 'setup for testing rm messages' '
 797         >bar.txt &&
 798         >foo.txt &&
 799         git add bar.txt foo.txt
 800 '
 801
 802 test_expect_success 'rm files with different staged content' '
 803         cat >expect <<-\EOF &&
 804         error: the following files have staged content different from both the
 805         file and the HEAD:
 806             bar.txt
 807             foo.txt
 808         (use -f to force removal)
 809         EOF
 810         echo content1 >foo.txt &&
 811         echo content1 >bar.txt &&
 812         test_must_fail git rm foo.txt bar.txt 2>actual &&
 813         test_i18ncmp expect actual
 814 '
 815
 816 test_expect_success 'rm files with different staged content without hints' '
 817         cat >expect <<-\EOF &&
 818         error: the following files have staged content different from both the
 819         file and the HEAD:
 820             bar.txt
 821             foo.txt
 822         EOF
 823         echo content2 >foo.txt &&
 824         echo content2 >bar.txt &&
 825         test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt 2>actual &&
 826         test_i18ncmp expect actual
 827 '
 828
 829 test_expect_success 'rm file with local modification' '
 830         cat >expect <<-\EOF &&
 831         error: the following file has local modifications:
 832             foo.txt
 833         (use --cached to keep the file, or -f to force removal)
 834         EOF
 835         git commit -m "testing rm 3" &&
 836         echo content3 >foo.txt &&
 837         test_must_fail git rm foo.txt 2>actual &&
 838         test_i18ncmp expect actual
 839 '
 840
 841 test_expect_success 'rm file with local modification without hints' '
 842         cat >expect <<-\EOF &&
 843         error: the following file has local modifications:
 844             bar.txt
 845         EOF
 846         echo content4 >bar.txt &&
 847         test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual &&
 848         test_i18ncmp expect actual
 849 '
 850
 851 test_expect_success 'rm file with changes in the index' '
 852         cat >expect <<-\EOF &&
 853         error: the following file has changes staged in the index:
 854             foo.txt
 855         (use --cached to keep the file, or -f to force removal)
 856         EOF
 857         git reset --hard &&
 858         echo content5 >foo.txt &&
 859         git add foo.txt &&
 860         test_must_fail git rm foo.txt 2>actual &&
 861         test_i18ncmp expect actual
 862 '
 863
 864 test_expect_success 'rm file with changes in the index without hints' '
 865         cat >expect <<-\EOF &&
 866         error: the following file has changes staged in the index:
 867             foo.txt
 868         EOF
 869         test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual &&
 870         test_i18ncmp expect actual
 871 '
 872
 873 test_expect_success 'rm files with two different errors' '
 874         cat >expect <<-\EOF &&
 875         error: the following file has staged content different from both the
 876         file and the HEAD:
 877             foo1.txt
 878         (use -f to force removal)
 879         error: the following file has changes staged in the index:
 880             bar1.txt
 881         (use --cached to keep the file, or -f to force removal)
 882         EOF
 883         echo content >foo1.txt &&
 884         git add foo1.txt &&
 885         echo content6 >foo1.txt &&
 886         echo content6 >bar1.txt &&
 887         git add bar1.txt &&
 888         test_must_fail git rm bar1.txt foo1.txt 2>actual &&
 889         test_i18ncmp expect actual
 890 '
 891
 892 test_expect_success 'rm empty string should fail' '
 893         test_must_fail git rm -rf ""
 894 '
 895
 896 test_done