Andrew's git / gitweb.git / t/t3600-rm.sh
?
t / t3600-rm.shon commit p7000: add test for filter-branch with --prune-empty (32da746)
   1#!/bin/sh
   2#
   3# Copyright (c) 2006 Carl D. Worth
   4#
   5
   6test_description='Test of the various options to git rm.'
   7
   8. ./test-lib.sh
   9
  10# Setup some files to be removed, some with funny characters
  11test_expect_success \
  12    'Initialize test directory' \
  13    "touch -- foo bar baz 'space embedded' -q &&
  14     git add -- foo bar baz 'space embedded' -q &&
  15     git commit -m 'add normal files'"
  16
  17if test_have_prereq !MINGW && touch -- 'tab     embedded' 'newline
  18embedded' 2>/dev/null
  19then
  20        test_set_prereq FUNNYNAMES
  21else
  22        say 'Your filesystem does not allow tabs in filenames.'
  23fi
  24
  25test_expect_success FUNNYNAMES 'add files with funny names' "
  26     git add -- 'tab    embedded' 'newline
  27embedded' &&
  28     git commit -m 'add files with tabs and newlines'
  29"
  30
  31test_expect_success \
  32    'Pre-check that foo exists and is in index before git rm foo' \
  33    '[ -f foo ] && git ls-files --error-unmatch foo'
  34
  35test_expect_success \
  36    'Test that git rm foo succeeds' \
  37    'git rm --cached foo'
  38
  39test_expect_success \
  40    'Test that git rm --cached foo succeeds if the index matches the file' \
  41    'echo content >foo &&
  42     git add foo &&
  43     git rm --cached foo'
  44
  45test_expect_success \
  46    'Test that git rm --cached foo succeeds if the index matches the file' \
  47    'echo content >foo &&
  48     git add foo &&
  49     git commit -m foo &&
  50     echo "other content" >foo &&
  51     git rm --cached foo'
  52
  53test_expect_success \
  54    'Test that git rm --cached foo fails if the index matches neither the file nor HEAD' '
  55     echo content >foo &&
  56     git add foo &&
  57     git commit -m foo --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
  64test_expect_success \
  65    'Test that git rm --cached -f foo works in case where --cached only did not' \
  66    'echo content >foo &&
  67     git add foo &&
  68     git commit -m foo --allow-empty &&
  69     echo "other content" >foo &&
  70     git add foo &&
  71     echo "yet another content" >foo &&
  72     git rm --cached -f foo'
  73
  74test_expect_success \
  75    'Post-check that foo exists but is not in index after git rm foo' \
  76    '[ -f foo ] && test_must_fail git ls-files --error-unmatch foo'
  77
  78test_expect_success \
  79    'Pre-check that bar exists and is in index before "git rm bar"' \
  80    '[ -f bar ] && git ls-files --error-unmatch bar'
  81
  82test_expect_success \
  83    'Test that "git rm bar" succeeds' \
  84    'git rm bar'
  85
  86test_expect_success \
  87    'Post-check that bar does not exist and is not in index after "git rm -f bar"' \
  88    '! [ -f bar ] && test_must_fail git ls-files --error-unmatch bar'
  89
  90test_expect_success \
  91    'Test that "git rm -- -q" succeeds (remove a file that looks like an option)' \
  92    'git rm -- -q'
  93
  94test_expect_success FUNNYNAMES \
  95    "Test that \"git rm -f\" succeeds with embedded space, tab, or newline characters." \
  96    "git rm -f 'space embedded' 'tab    embedded' 'newline
  97embedded'"
  98
  99test_expect_success SANITY 'Test that "git rm -f" fails if its rm fails' '
 100        chmod a-w . &&
 101        test_must_fail git rm -f baz &&
 102        chmod 775 .
 103'
 104
 105test_expect_success \
 106    'When the rm in "git rm -f" fails, it should not remove the file from the index' \
 107    'git ls-files --error-unmatch baz'
 108
 109test_expect_success 'Remove nonexistent file with --ignore-unmatch' '
 110        git rm --ignore-unmatch nonexistent
 111'
 112
 113test_expect_success '"rm" command printed' '
 114        echo frotz >test-file &&
 115        git add test-file &&
 116        git commit -m "add file for rm test" &&
 117        git rm test-file >rm-output &&
 118        test $(grep "^rm " rm-output | wc -l) = 1 &&
 119        rm -f test-file rm-output &&
 120        git commit -m "remove file from rm test"
 121'
 122
 123test_expect_success '"rm" command suppressed with --quiet' '
 124        echo frotz >test-file &&
 125        git add test-file &&
 126        git commit -m "add file for rm --quiet test" &&
 127        git rm --quiet test-file >rm-output &&
 128        test_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.
 134test_expect_success 'Re-add foo and baz' '
 135        git add foo baz &&
 136        git ls-files --error-unmatch foo baz
 137'
 138
 139test_expect_success 'Modify foo -- rm should refuse' '
 140        echo >>foo &&
 141        test_must_fail git rm foo baz &&
 142        test -f foo &&
 143        test -f baz &&
 144        git ls-files --error-unmatch foo baz
 145'
 146
 147test_expect_success 'Modified foo -- rm -f should work' '
 148        git rm -f foo baz &&
 149        test ! -f foo &&
 150        test ! -f baz &&
 151        test_must_fail git ls-files --error-unmatch foo &&
 152        test_must_fail git ls-files --error-unmatch bar
 153'
 154
 155test_expect_success 'Re-add foo and baz for HEAD tests' '
 156        echo frotz >foo &&
 157        git checkout HEAD -- baz &&
 158        git add foo baz &&
 159        git ls-files --error-unmatch foo baz
 160'
 161
 162test_expect_success 'foo is different in index from HEAD -- rm should refuse' '
 163        test_must_fail git rm foo baz &&
 164        test -f foo &&
 165        test -f baz &&
 166        git ls-files --error-unmatch foo baz
 167'
 168
 169test_expect_success 'but with -f it should work.' '
 170        git rm -f foo baz &&
 171        test ! -f foo &&
 172        test ! -f baz &&
 173        test_must_fail git ls-files --error-unmatch foo &&
 174        test_must_fail git ls-files --error-unmatch baz
 175'
 176
 177test_expect_success 'refuse to remove cached empty file with modifications' '
 178        >empty &&
 179        git add empty &&
 180        echo content >empty &&
 181        test_must_fail git rm --cached empty
 182'
 183
 184test_expect_success 'remove intent-to-add file without --force' '
 185        echo content >intent-to-add &&
 186        git add -N intent-to-add &&
 187        git rm --cached intent-to-add
 188'
 189
 190test_expect_success 'Recursive test setup' '
 191        mkdir -p frotz &&
 192        echo qfwfq >frotz/nitfol &&
 193        git add frotz &&
 194        git commit -m "subdir test"
 195'
 196
 197test_expect_success 'Recursive without -r fails' '
 198        test_must_fail git rm frotz &&
 199        test -d frotz &&
 200        test -f frotz/nitfol
 201'
 202
 203test_expect_success 'Recursive with -r but dirty' '
 204        echo qfwfq >>frotz/nitfol &&
 205        test_must_fail git rm -r frotz &&
 206        test -d frotz &&
 207        test -f frotz/nitfol
 208'
 209
 210test_expect_success 'Recursive with -r -f' '
 211        git rm -f -r frotz &&
 212        ! test -f frotz/nitfol &&
 213        ! test -d frotz
 214'
 215
 216test_expect_success 'Remove nonexistent file returns nonzero exit status' '
 217        test_must_fail git rm nonexistent
 218'
 219
 220test_expect_success 'Call "rm" from outside the work tree' '
 221        mkdir repo &&
 222        (cd repo &&
 223         git init &&
 224         echo something >somefile &&
 225         git add somefile &&
 226         git commit -m "add a file" &&
 227         (cd .. &&
 228          git --git-dir=repo/.git --work-tree=repo rm somefile) &&
 229        test_must_fail git ls-files --error-unmatch somefile)
 230'
 231
 232test_expect_success 'refresh index before checking if it is up-to-date' '
 233
 234        git reset --hard &&
 235        test-chmtime -86400 frotz/nitfol &&
 236        git rm frotz/nitfol &&
 237        test ! -f frotz/nitfol
 238
 239'
 240
 241test_expect_success 'choking "git rm" should not let it die with cruft' '
 242        git reset -q --hard &&
 243        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
 254test_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
 262cat >expect <<EOF
 263M  .gitmodules
 264D  submod
 265EOF
 266
 267cat >expect.modified <<EOF
 268 M submod
 269EOF
 270
 271cat >expect.cached <<EOF
 272D  submod
 273EOF
 274
 275cat >expect.both_deleted<<EOF
 276D  .gitmodules
 277D  submod
 278EOF
 279
 280test_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
 296test_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
 307test_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
 318test_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
 327test_expect_success 'rm fails when given a file with a trailing /' '
 328        test_must_fail git rm empty/
 329'
 330
 331test_expect_success 'rm succeeds when given a directory with a trailing /' '
 332        git rm -r frotz/
 333'
 334
 335test_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
 352test_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
 364test_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
 372test_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
 384test_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
 402test_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
 416test_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
 431test_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
 446test_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
 468cat >expect.conflict <<EOF
 469UU submod
 470EOF
 471
 472test_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
 483test_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
 502test_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
 521test_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
 538test_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
 562test_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
 572test_expect_success 'rm of a populated submodule with a .git directory fails even when forced' '
 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        ) &&
 581        test_must_fail git rm submod &&
 582        test -d submod &&
 583        test -d submod/.git &&
 584        git status -s -uno --ignore-submodules=none >actual &&
 585        ! test -s actual &&
 586        test_must_fail git rm -f submod &&
 587        test -d submod &&
 588        test -d submod/.git &&
 589        git status -s -uno --ignore-submodules=none >actual &&
 590        ! test -s actual &&
 591        rm -rf submod
 592'
 593
 594cat >expect.deepmodified <<EOF
 595 M submod/subsubmod
 596EOF
 597
 598test_expect_success 'setup subsubmodule' '
 599        git reset --hard &&
 600        git submodule update &&
 601        (cd submod &&
 602                git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) subsubmod &&
 603                git config -f .gitmodules submodule.sub.url ../. &&
 604                git config -f .gitmodules submodule.sub.path subsubmod &&
 605                git submodule init &&
 606                git add .gitmodules &&
 607                git commit -m "add subsubmodule" &&
 608                git submodule update subsubmod
 609        ) &&
 610        git commit -a -m "added deep submodule"
 611'
 612
 613test_expect_success 'rm recursively removes work tree of unmodified submodules' '
 614        git rm submod &&
 615        test ! -d submod &&
 616        git status -s -uno --ignore-submodules=none >actual &&
 617        test_cmp expect actual
 618'
 619
 620test_expect_success 'rm of a populated nested submodule with different nested HEAD fails unless forced' '
 621        git reset --hard &&
 622        git submodule update --recursive &&
 623        git -C submod/subsubmod checkout HEAD^ &&
 624        test_must_fail git rm submod &&
 625        test -d submod &&
 626        test -f submod/.git &&
 627        git status -s -uno --ignore-submodules=none >actual &&
 628        test_cmp expect.modified actual &&
 629        git rm -f submod &&
 630        test ! -d submod &&
 631        git status -s -uno --ignore-submodules=none >actual &&
 632        test_cmp expect actual
 633'
 634
 635test_expect_success 'rm of a populated nested submodule with nested modifications fails unless forced' '
 636        git reset --hard &&
 637        git submodule update --recursive &&
 638        echo X >submod/subsubmod/empty &&
 639        test_must_fail git rm submod &&
 640        test -d submod &&
 641        test -f submod/.git &&
 642        git status -s -uno --ignore-submodules=none >actual &&
 643        test_cmp expect.modified actual &&
 644        git rm -f submod &&
 645        test ! -d submod &&
 646        git status -s -uno --ignore-submodules=none >actual &&
 647        test_cmp expect actual
 648'
 649
 650test_expect_success 'rm of a populated nested submodule with nested untracked files fails unless forced' '
 651        git reset --hard &&
 652        git submodule update --recursive &&
 653        echo X >submod/subsubmod/untracked &&
 654        test_must_fail git rm submod &&
 655        test -d submod &&
 656        test -f submod/.git &&
 657        git status -s -uno --ignore-submodules=none >actual &&
 658        test_cmp expect.modified actual &&
 659        git rm -f submod &&
 660        test ! -d submod &&
 661        git status -s -uno --ignore-submodules=none >actual &&
 662        test_cmp expect actual
 663'
 664
 665test_expect_success 'rm of a populated nested submodule with a nested .git directory fails even when forced' '
 666        git reset --hard &&
 667        git submodule update --recursive &&
 668        (cd submod/subsubmod &&
 669                rm .git &&
 670                cp -R ../../.git/modules/sub/modules/sub .git &&
 671                GIT_WORK_TREE=. git config --unset core.worktree
 672        ) &&
 673        test_must_fail git rm submod &&
 674        test -d submod &&
 675        test -d submod/subsubmod/.git &&
 676        git status -s -uno --ignore-submodules=none >actual &&
 677        ! test -s actual &&
 678        test_must_fail git rm -f submod &&
 679        test -d submod &&
 680        test -d submod/subsubmod/.git &&
 681        git status -s -uno --ignore-submodules=none >actual &&
 682        ! test -s actual &&
 683        rm -rf submod
 684'
 685
 686test_expect_success 'checking out a commit after submodule removal needs manual updates' '
 687        git commit -m "submodule removal" submod &&
 688        git checkout HEAD^ &&
 689        git submodule update &&
 690        git checkout -q HEAD^ &&
 691        git checkout -q master 2>actual &&
 692        test_i18ngrep "^warning: unable to rmdir submod:" actual &&
 693        git status -s submod >actual &&
 694        echo "?? submod/" >expected &&
 695        test_cmp expected actual &&
 696        rm -rf submod &&
 697        git status -s -uno --ignore-submodules=none >actual &&
 698        ! test -s actual
 699'
 700
 701test_expect_success 'rm of d/f when d has become a non-directory' '
 702        rm -rf d &&
 703        mkdir d &&
 704        >d/f &&
 705        git add d &&
 706        rm -rf d &&
 707        >d &&
 708        git rm d/f &&
 709        test_must_fail git rev-parse --verify :d/f &&
 710        test_path_is_file d
 711'
 712
 713test_expect_success SYMLINKS 'rm of d/f when d has become a dangling symlink' '
 714        rm -rf d &&
 715        mkdir d &&
 716        >d/f &&
 717        git add d &&
 718        rm -rf d &&
 719        ln -s nonexistent d &&
 720        git rm d/f &&
 721        test_must_fail git rev-parse --verify :d/f &&
 722        test -h d &&
 723        test_path_is_missing d
 724'
 725
 726test_expect_success 'rm of file when it has become a directory' '
 727        rm -rf d &&
 728        >d &&
 729        git add d &&
 730        rm -f d &&
 731        mkdir d &&
 732        >d/f &&
 733        test_must_fail git rm d &&
 734        git rev-parse --verify :d &&
 735        test_path_is_file d/f
 736'
 737
 738test_expect_success SYMLINKS 'rm across a symlinked leading path (no index)' '
 739        rm -rf d e &&
 740        mkdir e &&
 741        echo content >e/f &&
 742        ln -s e d &&
 743        git add -A e d &&
 744        git commit -m "symlink d to e, e/f exists" &&
 745        test_must_fail git rm d/f &&
 746        git rev-parse --verify :d &&
 747        git rev-parse --verify :e/f &&
 748        test -h d &&
 749        test_path_is_file e/f
 750'
 751
 752test_expect_failure SYMLINKS 'rm across a symlinked leading path (w/ index)' '
 753        rm -rf d e &&
 754        mkdir d &&
 755        echo content >d/f &&
 756        git add -A e d &&
 757        git commit -m "d/f exists" &&
 758        mv d e &&
 759        ln -s e d &&
 760        test_must_fail git rm d/f &&
 761        git rev-parse --verify :d/f &&
 762        test -h d &&
 763        test_path_is_file e/f
 764'
 765
 766test_expect_success 'setup for testing rm messages' '
 767        >bar.txt &&
 768        >foo.txt &&
 769        git add bar.txt foo.txt
 770'
 771
 772test_expect_success 'rm files with different staged content' '
 773        cat >expect <<-\EOF &&
 774        error: the following files have staged content different from both the
 775        file and the HEAD:
 776            bar.txt
 777            foo.txt
 778        (use -f to force removal)
 779        EOF
 780        echo content1 >foo.txt &&
 781        echo content1 >bar.txt &&
 782        test_must_fail git rm foo.txt bar.txt 2>actual &&
 783        test_i18ncmp expect actual
 784'
 785
 786test_expect_success 'rm files with different staged content without hints' '
 787        cat >expect <<-\EOF &&
 788        error: the following files have staged content different from both the
 789        file and the HEAD:
 790            bar.txt
 791            foo.txt
 792        EOF
 793        echo content2 >foo.txt &&
 794        echo content2 >bar.txt &&
 795        test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt 2>actual &&
 796        test_i18ncmp expect actual
 797'
 798
 799test_expect_success 'rm file with local modification' '
 800        cat >expect <<-\EOF &&
 801        error: the following file has local modifications:
 802            foo.txt
 803        (use --cached to keep the file, or -f to force removal)
 804        EOF
 805        git commit -m "testing rm 3" &&
 806        echo content3 >foo.txt &&
 807        test_must_fail git rm foo.txt 2>actual &&
 808        test_i18ncmp expect actual
 809'
 810
 811test_expect_success 'rm file with local modification without hints' '
 812        cat >expect <<-\EOF &&
 813        error: the following file has local modifications:
 814            bar.txt
 815        EOF
 816        echo content4 >bar.txt &&
 817        test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual &&
 818        test_i18ncmp expect actual
 819'
 820
 821test_expect_success 'rm file with changes in the index' '
 822        cat >expect <<-\EOF &&
 823        error: the following file has changes staged in the index:
 824            foo.txt
 825        (use --cached to keep the file, or -f to force removal)
 826        EOF
 827        git reset --hard &&
 828        echo content5 >foo.txt &&
 829        git add foo.txt &&
 830        test_must_fail git rm foo.txt 2>actual &&
 831        test_i18ncmp expect actual
 832'
 833
 834test_expect_success 'rm file with changes in the index without hints' '
 835        cat >expect <<-\EOF &&
 836        error: the following file has changes staged in the index:
 837            foo.txt
 838        EOF
 839        test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual &&
 840        test_i18ncmp expect actual
 841'
 842
 843test_expect_success 'rm files with two different errors' '
 844        cat >expect <<-\EOF &&
 845        error: the following file has staged content different from both the
 846        file and the HEAD:
 847            foo1.txt
 848        (use -f to force removal)
 849        error: the following file has changes staged in the index:
 850            bar1.txt
 851        (use --cached to keep the file, or -f to force removal)
 852        EOF
 853        echo content >foo1.txt &&
 854        git add foo1.txt &&
 855        echo content6 >foo1.txt &&
 856        echo content6 >bar1.txt &&
 857        git add bar1.txt &&
 858        test_must_fail git rm bar1.txt foo1.txt 2>actual &&
 859        test_i18ncmp expect actual
 860'
 861
 862test_expect_success 'rm empty string should invoke warning' '
 863        git rm -rf "" 2>output &&
 864        test_i18ngrep "warning: empty strings" output
 865'
 866
 867test_done