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 \
  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
  17 if test_have_prereq !MINGW && touch -- 'tab     embedded' 'newline
  18 embedded' 2>/dev/null
  19 then
  20         test_set_prereq FUNNYNAMES
  21 else
  22         say 'Your filesystem does not allow tabs in filenames.'
  23 fi
  24
  25 test_expect_success FUNNYNAMES 'add files with funny names' "
  26      git add -- 'tab    embedded' 'newline
  27 embedded' &&
  28      git commit -m 'add files with tabs and newlines'
  29 "
  30
  31 test_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
  35 test_expect_success \
  36     'Test that git rm foo succeeds' \
  37     'git rm --cached foo'
  38
  39 test_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
  45 test_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
  53 test_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 --allow-empty &&
  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
  64 test_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 --allow-empty &&
  69      echo "other content" >foo &&
  70      git add foo &&
  71      echo "yet another content" >foo &&
  72      git rm --cached -f foo'
  73
  74 test_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
  78 test_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
  82 test_expect_success \
  83     'Test that "git rm bar" succeeds' \
  84     'git rm bar'
  85
  86 test_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
  90 test_expect_success \
  91     'Test that "git rm -- -q" succeeds (remove a file that looks like an option)' \
  92     'git rm -- -q'
  93
  94 test_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
  97 embedded'"
  98
  99 test_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
 105 test_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
 109 test_expect_success 'Remove nonexistent file with --ignore-unmatch' '
 110         git rm --ignore-unmatch nonexistent
 111 '
 112
 113 test_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
 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 -f foo &&
 143         test -f 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 ! -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
 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 -f foo &&
 165         test -f 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 ! -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
 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 -d frotz &&
 200         test -f 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 -d frotz &&
 207         test -f frotz/nitfol
 208 '
 209
 210 test_expect_success 'Recursive with -r -f' '
 211         git rm -f -r frotz &&
 212         ! test -f frotz/nitfol &&
 213         ! test -d 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         (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
 232 test_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
 241 test_expect_success 'choking "git rm" should not let it die with cruft' '
 242         git reset -q --hard &&
 243         test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
 244         i=0 &&
 245         while test $i -lt 12000
 246         do
 247             echo "100644 1234567890123456789012345678901234567890 0     some-file-$i"
 248             i=$(( $i + 1 ))
 249         done | git update-index --index-info &&
 250         git rm -n "some-file-*" | : &&
 251         test_path_is_missing .git/index.lock
 252 '
 253
 254 test_expect_success 'rm removes subdirectories recursively' '
 255         mkdir -p dir/subdir/subsubdir &&
 256         echo content >dir/subdir/subsubdir/file &&
 257         git add dir/subdir/subsubdir/file &&
 258         git rm -f dir/subdir/subsubdir/file &&
 259         ! test -d dir
 260 '
 261
 262 cat >expect <<EOF
 263 M  .gitmodules
 264 D  submod
 265 EOF
 266
 267 cat >expect.modified <<EOF
 268  M submod
 269 EOF
 270
 271 cat >expect.cached <<EOF
 272 D  submod
 273 EOF
 274
 275 cat >expect.both_deleted<<EOF
 276 D  .gitmodules
 277 D  submod
 278 EOF
 279
 280 test_expect_success 'rm removes empty submodules from work tree' '
 281         mkdir submod &&
 282         git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) submod &&
 283         git config -f .gitmodules submodule.sub.url ./. &&
 284         git config -f .gitmodules submodule.sub.path submod &&
 285         git submodule init &&
 286         git add .gitmodules &&
 287         git commit -m "add submodule" &&
 288         git rm submod &&
 289         test ! -e submod &&
 290         git status -s -uno --ignore-submodules=none >actual &&
 291         test_cmp expect actual &&
 292         test_must_fail git config -f .gitmodules submodule.sub.url &&
 293         test_must_fail git config -f .gitmodules submodule.sub.path
 294 '
 295
 296 test_expect_success 'rm removes removed submodule from index and .gitmodules' '
 297         git reset --hard &&
 298         git submodule update &&
 299         rm -rf submod &&
 300         git rm submod &&
 301         git status -s -uno --ignore-submodules=none >actual &&
 302         test_cmp expect actual &&
 303         test_must_fail git config -f .gitmodules submodule.sub.url &&
 304         test_must_fail git config -f .gitmodules submodule.sub.path
 305 '
 306
 307 test_expect_success 'rm removes work tree of unmodified submodules' '
 308         git reset --hard &&
 309         git submodule update &&
 310         git rm submod &&
 311         test ! -d submod &&
 312         git status -s -uno --ignore-submodules=none >actual &&
 313         test_cmp expect actual &&
 314         test_must_fail git config -f .gitmodules submodule.sub.url &&
 315         test_must_fail git config -f .gitmodules submodule.sub.path
 316 '
 317
 318 test_expect_success 'rm removes a submodule with a trailing /' '
 319         git reset --hard &&
 320         git submodule update &&
 321         git rm submod/ &&
 322         test ! -d submod &&
 323         git status -s -uno --ignore-submodules=none >actual &&
 324         test_cmp expect actual
 325 '
 326
 327 test_expect_success 'rm fails when given a file with a trailing /' '
 328         test_must_fail git rm empty/
 329 '
 330
 331 test_expect_success 'rm succeeds when given a directory with a trailing /' '
 332         git rm -r frotz/
 333 '
 334
 335 test_expect_success 'rm of a populated submodule with different HEAD fails unless forced' '
 336         git reset --hard &&
 337         git submodule update &&
 338         git -C submod checkout HEAD^ &&
 339         test_must_fail git rm submod &&
 340         test -d submod &&
 341         test -f submod/.git &&
 342         git status -s -uno --ignore-submodules=none >actual &&
 343         test_cmp expect.modified actual &&
 344         git rm -f submod &&
 345         test ! -d submod &&
 346         git status -s -uno --ignore-submodules=none >actual &&
 347         test_cmp expect actual &&
 348         test_must_fail git config -f .gitmodules submodule.sub.url &&
 349         test_must_fail git config -f .gitmodules submodule.sub.path
 350 '
 351
 352 test_expect_success 'rm --cached leaves work tree of populated submodules and .gitmodules alone' '
 353         git reset --hard &&
 354         git submodule update &&
 355         git rm --cached submod &&
 356         test -d submod &&
 357         test -f submod/.git &&
 358         git status -s -uno >actual &&
 359         test_cmp expect.cached actual &&
 360         git config -f .gitmodules submodule.sub.url &&
 361         git config -f .gitmodules submodule.sub.path
 362 '
 363
 364 test_expect_success 'rm --dry-run does not touch the submodule or .gitmodules' '
 365         git reset --hard &&
 366         git submodule update &&
 367         git rm -n submod &&
 368         test -f submod/.git &&
 369         git diff-index --exit-code HEAD
 370 '
 371
 372 test_expect_success 'rm does not complain when no .gitmodules file is found' '
 373         git reset --hard &&
 374         git submodule update &&
 375         git rm .gitmodules &&
 376         git rm submod >actual 2>actual.err &&
 377         ! test -s actual.err &&
 378         ! test -d submod &&
 379         ! test -f submod/.git &&
 380         git status -s -uno >actual &&
 381         test_cmp expect.both_deleted actual
 382 '
 383
 384 test_expect_success 'rm will error out on a modified .gitmodules file unless staged' '
 385         git reset --hard &&
 386         git submodule update &&
 387         git config -f .gitmodules foo.bar true &&
 388         test_must_fail git rm submod >actual 2>actual.err &&
 389         test -s actual.err &&
 390         test -d submod &&
 391         test -f submod/.git &&
 392         git diff-files --quiet -- submod &&
 393         git add .gitmodules &&
 394         git rm submod >actual 2>actual.err &&
 395         ! test -s actual.err &&
 396         ! test -d submod &&
 397         ! test -f submod/.git &&
 398         git status -s -uno >actual &&
 399         test_cmp expect actual
 400 '
 401
 402 test_expect_success 'rm issues a warning when section is not found in .gitmodules' '
 403         git reset --hard &&
 404         git submodule update &&
 405         git config -f .gitmodules --remove-section submodule.sub &&
 406         git add .gitmodules &&
 407         echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
 408         git rm submod >actual 2>actual.err &&
 409         test_i18ncmp expect.err actual.err &&
 410         ! test -d submod &&
 411         ! test -f submod/.git &&
 412         git status -s -uno >actual &&
 413         test_cmp expect actual
 414 '
 415
 416 test_expect_success 'rm of a populated submodule with modifications fails unless forced' '
 417         git reset --hard &&
 418         git submodule update &&
 419         echo X >submod/empty &&
 420         test_must_fail git rm submod &&
 421         test -d submod &&
 422         test -f submod/.git &&
 423         git status -s -uno --ignore-submodules=none >actual &&
 424         test_cmp expect.modified actual &&
 425         git rm -f submod &&
 426         test ! -d submod &&
 427         git status -s -uno --ignore-submodules=none >actual &&
 428         test_cmp expect actual
 429 '
 430
 431 test_expect_success 'rm of a populated submodule with untracked files fails unless forced' '
 432         git reset --hard &&
 433         git submodule update &&
 434         echo X >submod/untracked &&
 435         test_must_fail git rm submod &&
 436         test -d submod &&
 437         test -f submod/.git &&
 438         git status -s -uno --ignore-submodules=none >actual &&
 439         test_cmp expect.modified actual &&
 440         git rm -f submod &&
 441         test ! -d submod &&
 442         git status -s -uno --ignore-submodules=none >actual &&
 443         test_cmp expect actual
 444 '
 445
 446 test_expect_success 'setup submodule conflict' '
 447         git reset --hard &&
 448         git submodule update &&
 449         git checkout -b branch1 &&
 450         echo 1 >nitfol &&
 451         git add nitfol &&
 452         git commit -m "added nitfol 1" &&
 453         git checkout -b branch2 master &&
 454         echo 2 >nitfol &&
 455         git add nitfol &&
 456         git commit -m "added nitfol 2" &&
 457         git checkout -b conflict1 master &&
 458         git -C submod fetch &&
 459         git -C submod checkout branch1 &&
 460         git add submod &&
 461         git commit -m "submod 1" &&
 462         git checkout -b conflict2 master &&
 463         git -C submod checkout branch2 &&
 464         git add submod &&
 465         git commit -m "submod 2"
 466 '
 467
 468 cat >expect.conflict <<EOF
 469 UU submod
 470 EOF
 471
 472 test_expect_success 'rm removes work tree of unmodified conflicted submodule' '
 473         git checkout conflict1 &&
 474         git reset --hard &&
 475         git submodule update &&
 476         test_must_fail git merge conflict2 &&
 477         git rm submod &&
 478         test ! -d submod &&
 479         git status -s -uno --ignore-submodules=none >actual &&
 480         test_cmp expect actual
 481 '
 482
 483 test_expect_success 'rm of a conflicted populated submodule with different HEAD fails unless forced' '
 484         git checkout conflict1 &&
 485         git reset --hard &&
 486         git submodule update &&
 487         git -C submod checkout HEAD^ &&
 488         test_must_fail git merge conflict2 &&
 489         test_must_fail git rm submod &&
 490         test -d submod &&
 491         test -f submod/.git &&
 492         git status -s -uno --ignore-submodules=none >actual &&
 493         test_cmp expect.conflict actual &&
 494         git rm -f submod &&
 495         test ! -d submod &&
 496         git status -s -uno --ignore-submodules=none >actual &&
 497         test_cmp expect actual &&
 498         test_must_fail git config -f .gitmodules submodule.sub.url &&
 499         test_must_fail git config -f .gitmodules submodule.sub.path
 500 '
 501
 502 test_expect_success 'rm of a conflicted populated submodule with modifications fails unless forced' '
 503         git checkout conflict1 &&
 504         git reset --hard &&
 505         git submodule update &&
 506         echo X >submod/empty &&
 507         test_must_fail git merge conflict2 &&
 508         test_must_fail git rm submod &&
 509         test -d submod &&
 510         test -f submod/.git &&
 511         git status -s -uno --ignore-submodules=none >actual &&
 512         test_cmp expect.conflict actual &&
 513         git rm -f submod &&
 514         test ! -d submod &&
 515         git status -s -uno --ignore-submodules=none >actual &&
 516         test_cmp expect actual &&
 517         test_must_fail git config -f .gitmodules submodule.sub.url &&
 518         test_must_fail git config -f .gitmodules submodule.sub.path
 519 '
 520
 521 test_expect_success 'rm of a conflicted populated submodule with untracked files fails unless forced' '
 522         git checkout conflict1 &&
 523         git reset --hard &&
 524         git submodule update &&
 525         echo X >submod/untracked &&
 526         test_must_fail git merge conflict2 &&
 527         test_must_fail git rm submod &&
 528         test -d submod &&
 529         test -f submod/.git &&
 530         git status -s -uno --ignore-submodules=none >actual &&
 531         test_cmp expect.conflict actual &&
 532         git rm -f submod &&
 533         test ! -d submod &&
 534         git status -s -uno --ignore-submodules=none >actual &&
 535         test_cmp expect actual
 536 '
 537
 538 test_expect_success 'rm of a conflicted populated submodule with a .git directory fails even when forced' '
 539         git checkout conflict1 &&
 540         git reset --hard &&
 541         git submodule update &&
 542         (cd submod &&
 543                 rm .git &&
 544                 cp -R ../.git/modules/sub .git &&
 545                 GIT_WORK_TREE=. git config --unset core.worktree
 546         ) &&
 547         test_must_fail git merge conflict2 &&
 548         test_must_fail git rm submod &&
 549         test -d submod &&
 550         test -d submod/.git &&
 551         git status -s -uno --ignore-submodules=none >actual &&
 552         test_cmp expect.conflict actual &&
 553         test_must_fail git rm -f submod &&
 554         test -d submod &&
 555         test -d submod/.git &&
 556         git status -s -uno --ignore-submodules=none >actual &&
 557         test_cmp expect.conflict actual &&
 558         git merge --abort &&
 559         rm -rf submod
 560 '
 561
 562 test_expect_success 'rm of a conflicted unpopulated submodule succeeds' '
 563         git checkout conflict1 &&
 564         git reset --hard &&
 565         test_must_fail git merge conflict2 &&
 566         git rm submod &&
 567         test ! -d submod &&
 568         git status -s -uno --ignore-submodules=none >actual &&
 569         test_cmp expect actual
 570 '
 571
 572 test_expect_success 'rm of a populated submodule with a .git directory migrates git dir' '
 573         git checkout -f master &&
 574         git reset --hard &&
 575         git submodule update &&
 576         (cd submod &&
 577                 rm .git &&
 578                 cp -R ../.git/modules/sub .git &&
 579                 GIT_WORK_TREE=. git config --unset core.worktree &&
 580                 rm -r ../.git/modules/sub
 581         ) &&
 582         git rm submod 2>output.err &&
 583         ! test -d submod &&
 584         ! test -d submod/.git &&
 585         git status -s -uno --ignore-submodules=none >actual &&
 586         test -s actual &&
 587         test_i18ngrep Migrating output.err
 588 '
 589
 590 cat >expect.deepmodified <<EOF
 591  M submod/subsubmod
 592 EOF
 593
 594 test_expect_success 'setup subsubmodule' '
 595         git reset --hard &&
 596         git submodule update &&
 597         (cd submod &&
 598                 git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) subsubmod &&
 599                 git config -f .gitmodules submodule.sub.url ../. &&
 600                 git config -f .gitmodules submodule.sub.path subsubmod &&
 601                 git submodule init &&
 602                 git add .gitmodules &&
 603                 git commit -m "add subsubmodule" &&
 604                 git submodule update subsubmod
 605         ) &&
 606         git commit -a -m "added deep submodule"
 607 '
 608
 609 test_expect_success 'rm recursively removes work tree of unmodified submodules' '
 610         git rm submod &&
 611         test ! -d submod &&
 612         git status -s -uno --ignore-submodules=none >actual &&
 613         test_cmp expect actual
 614 '
 615
 616 test_expect_success 'rm of a populated nested submodule with different nested HEAD fails unless forced' '
 617         git reset --hard &&
 618         git submodule update --recursive &&
 619         git -C submod/subsubmod checkout HEAD^ &&
 620         test_must_fail git rm submod &&
 621         test -d submod &&
 622         test -f submod/.git &&
 623         git status -s -uno --ignore-submodules=none >actual &&
 624         test_cmp expect.modified actual &&
 625         git rm -f submod &&
 626         test ! -d submod &&
 627         git status -s -uno --ignore-submodules=none >actual &&
 628         test_cmp expect actual
 629 '
 630
 631 test_expect_success 'rm of a populated nested submodule with nested modifications fails unless forced' '
 632         git reset --hard &&
 633         git submodule update --recursive &&
 634         echo X >submod/subsubmod/empty &&
 635         test_must_fail git rm submod &&
 636         test -d submod &&
 637         test -f submod/.git &&
 638         git status -s -uno --ignore-submodules=none >actual &&
 639         test_cmp expect.modified actual &&
 640         git rm -f submod &&
 641         test ! -d submod &&
 642         git status -s -uno --ignore-submodules=none >actual &&
 643         test_cmp expect actual
 644 '
 645
 646 test_expect_success 'rm of a populated nested submodule with nested untracked files fails unless forced' '
 647         git reset --hard &&
 648         git submodule update --recursive &&
 649         echo X >submod/subsubmod/untracked &&
 650         test_must_fail git rm submod &&
 651         test -d submod &&
 652         test -f submod/.git &&
 653         git status -s -uno --ignore-submodules=none >actual &&
 654         test_cmp expect.modified actual &&
 655         git rm -f submod &&
 656         test ! -d submod &&
 657         git status -s -uno --ignore-submodules=none >actual &&
 658         test_cmp expect actual
 659 '
 660
 661 test_expect_success "rm absorbs submodule's nested .git directory" '
 662         git reset --hard &&
 663         git submodule update --recursive &&
 664         (cd submod/subsubmod &&
 665                 rm .git &&
 666                 mv ../../.git/modules/sub/modules/sub .git &&
 667                 GIT_WORK_TREE=. git config --unset core.worktree
 668         ) &&
 669         git rm submod 2>output.err &&
 670         ! test -d submod &&
 671         ! test -d submod/subsubmod/.git &&
 672         git status -s -uno --ignore-submodules=none >actual &&
 673         test -s actual &&
 674         test_i18ngrep Migrating output.err
 675 '
 676
 677 test_expect_success 'checking out a commit after submodule removal needs manual updates' '
 678         git commit -m "submodule removal" submod .gitmodules &&
 679         git checkout HEAD^ &&
 680         git submodule update &&
 681         git checkout -q HEAD^ &&
 682         git checkout -q master 2>actual &&
 683         test_i18ngrep "^warning: unable to rmdir submod:" actual &&
 684         git status -s submod >actual &&
 685         echo "?? submod/" >expected &&
 686         test_cmp expected actual &&
 687         rm -rf submod &&
 688         git status -s -uno --ignore-submodules=none >actual &&
 689         ! test -s actual
 690 '
 691
 692 test_expect_success 'rm of d/f when d has become a non-directory' '
 693         rm -rf d &&
 694         mkdir d &&
 695         >d/f &&
 696         git add d &&
 697         rm -rf d &&
 698         >d &&
 699         git rm d/f &&
 700         test_must_fail git rev-parse --verify :d/f &&
 701         test_path_is_file d
 702 '
 703
 704 test_expect_success SYMLINKS 'rm of d/f when d has become a dangling symlink' '
 705         rm -rf d &&
 706         mkdir d &&
 707         >d/f &&
 708         git add d &&
 709         rm -rf d &&
 710         ln -s nonexistent d &&
 711         git rm d/f &&
 712         test_must_fail git rev-parse --verify :d/f &&
 713         test -h d &&
 714         test_path_is_missing d
 715 '
 716
 717 test_expect_success 'rm of file when it has become a directory' '
 718         rm -rf d &&
 719         >d &&
 720         git add d &&
 721         rm -f d &&
 722         mkdir d &&
 723         >d/f &&
 724         test_must_fail git rm d &&
 725         git rev-parse --verify :d &&
 726         test_path_is_file d/f
 727 '
 728
 729 test_expect_success SYMLINKS 'rm across a symlinked leading path (no index)' '
 730         rm -rf d e &&
 731         mkdir e &&
 732         echo content >e/f &&
 733         ln -s e d &&
 734         git add -A e d &&
 735         git commit -m "symlink d to e, e/f exists" &&
 736         test_must_fail git rm d/f &&
 737         git rev-parse --verify :d &&
 738         git rev-parse --verify :e/f &&
 739         test -h d &&
 740         test_path_is_file e/f
 741 '
 742
 743 test_expect_failure SYMLINKS 'rm across a symlinked leading path (w/ index)' '
 744         rm -rf d e &&
 745         mkdir d &&
 746         echo content >d/f &&
 747         git add -A e d &&
 748         git commit -m "d/f exists" &&
 749         mv d e &&
 750         ln -s e d &&
 751         test_must_fail git rm d/f &&
 752         git rev-parse --verify :d/f &&
 753         test -h d &&
 754         test_path_is_file e/f
 755 '
 756
 757 test_expect_success 'setup for testing rm messages' '
 758         >bar.txt &&
 759         >foo.txt &&
 760         git add bar.txt foo.txt
 761 '
 762
 763 test_expect_success 'rm files with different staged content' '
 764         cat >expect <<-\EOF &&
 765         error: the following files have staged content different from both the
 766         file and the HEAD:
 767             bar.txt
 768             foo.txt
 769         (use -f to force removal)
 770         EOF
 771         echo content1 >foo.txt &&
 772         echo content1 >bar.txt &&
 773         test_must_fail git rm foo.txt bar.txt 2>actual &&
 774         test_i18ncmp expect actual
 775 '
 776
 777 test_expect_success 'rm files with different staged content without hints' '
 778         cat >expect <<-\EOF &&
 779         error: the following files have staged content different from both the
 780         file and the HEAD:
 781             bar.txt
 782             foo.txt
 783         EOF
 784         echo content2 >foo.txt &&
 785         echo content2 >bar.txt &&
 786         test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt 2>actual &&
 787         test_i18ncmp expect actual
 788 '
 789
 790 test_expect_success 'rm file with local modification' '
 791         cat >expect <<-\EOF &&
 792         error: the following file has local modifications:
 793             foo.txt
 794         (use --cached to keep the file, or -f to force removal)
 795         EOF
 796         git commit -m "testing rm 3" &&
 797         echo content3 >foo.txt &&
 798         test_must_fail git rm foo.txt 2>actual &&
 799         test_i18ncmp expect actual
 800 '
 801
 802 test_expect_success 'rm file with local modification without hints' '
 803         cat >expect <<-\EOF &&
 804         error: the following file has local modifications:
 805             bar.txt
 806         EOF
 807         echo content4 >bar.txt &&
 808         test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual &&
 809         test_i18ncmp expect actual
 810 '
 811
 812 test_expect_success 'rm file with changes in the index' '
 813         cat >expect <<-\EOF &&
 814         error: the following file has changes staged in the index:
 815             foo.txt
 816         (use --cached to keep the file, or -f to force removal)
 817         EOF
 818         git reset --hard &&
 819         echo content5 >foo.txt &&
 820         git add foo.txt &&
 821         test_must_fail git rm foo.txt 2>actual &&
 822         test_i18ncmp expect actual
 823 '
 824
 825 test_expect_success 'rm file with changes in the index without hints' '
 826         cat >expect <<-\EOF &&
 827         error: the following file has changes staged in the index:
 828             foo.txt
 829         EOF
 830         test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual &&
 831         test_i18ncmp expect actual
 832 '
 833
 834 test_expect_success 'rm files with two different errors' '
 835         cat >expect <<-\EOF &&
 836         error: the following file has staged content different from both the
 837         file and the HEAD:
 838             foo1.txt
 839         (use -f to force removal)
 840         error: the following file has changes staged in the index:
 841             bar1.txt
 842         (use --cached to keep the file, or -f to force removal)
 843         EOF
 844         echo content >foo1.txt &&
 845         git add foo1.txt &&
 846         echo content6 >foo1.txt &&
 847         echo content6 >bar1.txt &&
 848         git add bar1.txt &&
 849         test_must_fail git rm bar1.txt foo1.txt 2>actual &&
 850         test_i18ncmp expect actual
 851 '
 852
 853 test_expect_success 'rm empty string should invoke warning' '
 854         git rm -rf "" 2>output &&
 855         test_i18ngrep "warning: empty strings" output
 856 '
 857
 858 test_done