t/t7508-status.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2007 Johannes E. Schindelin
   4 #
   5
   6 test_description='git status'
   7
   8 . ./test-lib.sh
   9
  10 test_expect_success 'status -h in broken repository' '
  11         mkdir broken &&
  12         test_when_finished "rm -fr broken" &&
  13         (
  14                 cd broken &&
  15                 git init &&
  16                 echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
  17                 test_expect_code 129 git status -h >usage 2>&1
  18         ) &&
  19         grep "[Uu]sage" broken/usage
  20 '
  21
  22 test_expect_success 'commit -h in broken repository' '
  23         mkdir broken &&
  24         test_when_finished "rm -fr broken" &&
  25         (
  26                 cd broken &&
  27                 git init &&
  28                 echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
  29                 test_expect_code 129 git commit -h >usage 2>&1
  30         ) &&
  31         grep "[Uu]sage" broken/usage
  32 '
  33
  34 test_expect_success 'setup' '
  35         : >tracked &&
  36         : >modified &&
  37         mkdir dir1 &&
  38         : >dir1/tracked &&
  39         : >dir1/modified &&
  40         mkdir dir2 &&
  41         : >dir1/tracked &&
  42         : >dir1/modified &&
  43         git add . &&
  44
  45         git status >output &&
  46
  47         test_tick &&
  48         git commit -m initial &&
  49         : >untracked &&
  50         : >dir1/untracked &&
  51         : >dir2/untracked &&
  52         echo 1 >dir1/modified &&
  53         echo 2 >dir2/modified &&
  54         echo 3 >dir2/added &&
  55         git add dir2/added
  56 '
  57
  58 test_expect_success C_LOCALE_OUTPUT 'status (1)' '
  59
  60         grep "use \"git rm --cached <file>\.\.\.\" to unstage" output
  61
  62 '
  63
  64 cat >expect <<\EOF
  65 # On branch master
  66 # Changes to be committed:
  67 #   (use "git reset HEAD <file>..." to unstage)
  68 #
  69 #       new file:   dir2/added
  70 #
  71 # Changes not staged for commit:
  72 #   (use "git add <file>..." to update what will be committed)
  73 #   (use "git checkout -- <file>..." to discard changes in working directory)
  74 #
  75 #       modified:   dir1/modified
  76 #
  77 # Untracked files:
  78 #   (use "git add <file>..." to include in what will be committed)
  79 #
  80 #       dir1/untracked
  81 #       dir2/modified
  82 #       dir2/untracked
  83 #       expect
  84 #       output
  85 #       untracked
  86 EOF
  87
  88 test_expect_success C_LOCALE_OUTPUT 'status (2)' '
  89
  90         git status >output &&
  91         test_cmp expect output
  92
  93 '
  94
  95 cat >expect <<\EOF
  96 # On branch master
  97 # Changes to be committed:
  98 #       new file:   dir2/added
  99 #
 100 # Changes not staged for commit:
 101 #       modified:   dir1/modified
 102 #
 103 # Untracked files:
 104 #       dir1/untracked
 105 #       dir2/modified
 106 #       dir2/untracked
 107 #       expect
 108 #       output
 109 #       untracked
 110 EOF
 111
 112 git config advice.statusHints false
 113
 114 test_expect_success C_LOCALE_OUTPUT 'status (advice.statusHints false)' '
 115
 116         git status >output &&
 117         test_cmp expect output
 118
 119 '
 120
 121 git config --unset advice.statusHints
 122
 123 cat >expect <<\EOF
 124  M dir1/modified
 125 A  dir2/added
 126 ?? dir1/untracked
 127 ?? dir2/modified
 128 ?? dir2/untracked
 129 ?? expect
 130 ?? output
 131 ?? untracked
 132 EOF
 133
 134 test_expect_success 'status -s' '
 135
 136         git status -s >output &&
 137         test_cmp expect output
 138
 139 '
 140
 141 cat >expect <<\EOF
 142 ## master
 143  M dir1/modified
 144 A  dir2/added
 145 ?? dir1/untracked
 146 ?? dir2/modified
 147 ?? dir2/untracked
 148 ?? expect
 149 ?? output
 150 ?? untracked
 151 EOF
 152
 153 test_expect_success 'status -s -b' '
 154
 155         git status -s -b >output &&
 156         test_cmp expect output
 157
 158 '
 159
 160 test_expect_success 'setup dir3' '
 161         mkdir dir3 &&
 162         : >dir3/untracked1 &&
 163         : >dir3/untracked2
 164 '
 165
 166 cat >expect <<EOF
 167 # On branch master
 168 # Changes to be committed:
 169 #   (use "git reset HEAD <file>..." to unstage)
 170 #
 171 #       new file:   dir2/added
 172 #
 173 # Changes not staged for commit:
 174 #   (use "git add <file>..." to update what will be committed)
 175 #   (use "git checkout -- <file>..." to discard changes in working directory)
 176 #
 177 #       modified:   dir1/modified
 178 #
 179 # Untracked files not listed (use -u option to show untracked files)
 180 EOF
 181 test_expect_success C_LOCALE_OUTPUT 'status -uno' '
 182         git status -uno >output &&
 183         test_cmp expect output
 184 '
 185
 186 test_expect_success C_LOCALE_OUTPUT 'status (status.showUntrackedFiles no)' '
 187         git config status.showuntrackedfiles no
 188         test_when_finished "git config --unset status.showuntrackedfiles" &&
 189         git status >output &&
 190         test_cmp expect output
 191 '
 192
 193 cat >expect <<EOF
 194 # On branch master
 195 # Changes to be committed:
 196 #       new file:   dir2/added
 197 #
 198 # Changes not staged for commit:
 199 #       modified:   dir1/modified
 200 #
 201 # Untracked files not listed
 202 EOF
 203 git config advice.statusHints false
 204 test_expect_success C_LOCALE_OUTPUT 'status -uno (advice.statusHints false)' '
 205         git status -uno >output &&
 206         test_cmp expect output
 207 '
 208 git config --unset advice.statusHints
 209
 210 cat >expect << EOF
 211  M dir1/modified
 212 A  dir2/added
 213 EOF
 214 test_expect_success 'status -s -uno' '
 215         git status -s -uno >output &&
 216         test_cmp expect output
 217 '
 218
 219 test_expect_success 'status -s (status.showUntrackedFiles no)' '
 220         git config status.showuntrackedfiles no
 221         git status -s >output &&
 222         test_cmp expect output
 223 '
 224
 225 cat >expect <<EOF
 226 # On branch master
 227 # Changes to be committed:
 228 #   (use "git reset HEAD <file>..." to unstage)
 229 #
 230 #       new file:   dir2/added
 231 #
 232 # Changes not staged for commit:
 233 #   (use "git add <file>..." to update what will be committed)
 234 #   (use "git checkout -- <file>..." to discard changes in working directory)
 235 #
 236 #       modified:   dir1/modified
 237 #
 238 # Untracked files:
 239 #   (use "git add <file>..." to include in what will be committed)
 240 #
 241 #       dir1/untracked
 242 #       dir2/modified
 243 #       dir2/untracked
 244 #       dir3/
 245 #       expect
 246 #       output
 247 #       untracked
 248 EOF
 249 test_expect_success C_LOCALE_OUTPUT 'status -unormal' '
 250         git status -unormal >output &&
 251         test_cmp expect output
 252 '
 253
 254 test_expect_success C_LOCALE_OUTPUT 'status (status.showUntrackedFiles normal)' '
 255         git config status.showuntrackedfiles normal
 256         test_when_finished "git config --unset status.showuntrackedfiles" &&
 257         git status >output &&
 258         test_cmp expect output
 259 '
 260
 261 cat >expect <<EOF
 262  M dir1/modified
 263 A  dir2/added
 264 ?? dir1/untracked
 265 ?? dir2/modified
 266 ?? dir2/untracked
 267 ?? dir3/
 268 ?? expect
 269 ?? output
 270 ?? untracked
 271 EOF
 272 test_expect_success 'status -s -unormal' '
 273         git status -s -unormal >output &&
 274         test_cmp expect output
 275 '
 276
 277 test_expect_success 'status -s (status.showUntrackedFiles normal)' '
 278         git config status.showuntrackedfiles normal
 279         git status -s >output &&
 280         test_cmp expect output
 281 '
 282
 283 cat >expect <<EOF
 284 # On branch master
 285 # Changes to be committed:
 286 #   (use "git reset HEAD <file>..." to unstage)
 287 #
 288 #       new file:   dir2/added
 289 #
 290 # Changes not staged for commit:
 291 #   (use "git add <file>..." to update what will be committed)
 292 #   (use "git checkout -- <file>..." to discard changes in working directory)
 293 #
 294 #       modified:   dir1/modified
 295 #
 296 # Untracked files:
 297 #   (use "git add <file>..." to include in what will be committed)
 298 #
 299 #       dir1/untracked
 300 #       dir2/modified
 301 #       dir2/untracked
 302 #       dir3/untracked1
 303 #       dir3/untracked2
 304 #       expect
 305 #       output
 306 #       untracked
 307 EOF
 308 test_expect_success C_LOCALE_OUTPUT 'status -uall' '
 309         git status -uall >output &&
 310         test_cmp expect output
 311 '
 312 test_expect_success C_LOCALE_OUTPUT 'status (status.showUntrackedFiles all)' '
 313         git config status.showuntrackedfiles all
 314         test_when_finished "git config --unset status.showuntrackedfiles" &&
 315         git status >output &&
 316         test_cmp expect output
 317 '
 318
 319 test_expect_success 'teardown dir3' '
 320         rm -rf dir3
 321 '
 322
 323 cat >expect <<EOF
 324  M dir1/modified
 325 A  dir2/added
 326 ?? dir1/untracked
 327 ?? dir2/modified
 328 ?? dir2/untracked
 329 ?? expect
 330 ?? output
 331 ?? untracked
 332 EOF
 333 test_expect_success 'status -s -uall' '
 334         git config --unset status.showuntrackedfiles
 335         git status -s -uall >output &&
 336         test_cmp expect output
 337 '
 338 test_expect_success 'status -s (status.showUntrackedFiles all)' '
 339         git config status.showuntrackedfiles all
 340         git status -s >output &&
 341         rm -rf dir3 &&
 342         git config --unset status.showuntrackedfiles &&
 343         test_cmp expect output
 344 '
 345
 346 cat >expect <<\EOF
 347 # On branch master
 348 # Changes to be committed:
 349 #   (use "git reset HEAD <file>..." to unstage)
 350 #
 351 #       new file:   ../dir2/added
 352 #
 353 # Changes not staged for commit:
 354 #   (use "git add <file>..." to update what will be committed)
 355 #   (use "git checkout -- <file>..." to discard changes in working directory)
 356 #
 357 #       modified:   modified
 358 #
 359 # Untracked files:
 360 #   (use "git add <file>..." to include in what will be committed)
 361 #
 362 #       untracked
 363 #       ../dir2/modified
 364 #       ../dir2/untracked
 365 #       ../expect
 366 #       ../output
 367 #       ../untracked
 368 EOF
 369
 370 test_expect_success C_LOCALE_OUTPUT 'status with relative paths' '
 371
 372         (cd dir1 && git status) >output &&
 373         test_cmp expect output
 374
 375 '
 376
 377 cat >expect <<\EOF
 378  M modified
 379 A  ../dir2/added
 380 ?? untracked
 381 ?? ../dir2/modified
 382 ?? ../dir2/untracked
 383 ?? ../expect
 384 ?? ../output
 385 ?? ../untracked
 386 EOF
 387 test_expect_success 'status -s with relative paths' '
 388
 389         (cd dir1 && git status -s) >output &&
 390         test_cmp expect output
 391
 392 '
 393
 394 cat >expect <<\EOF
 395  M dir1/modified
 396 A  dir2/added
 397 ?? dir1/untracked
 398 ?? dir2/modified
 399 ?? dir2/untracked
 400 ?? expect
 401 ?? output
 402 ?? untracked
 403 EOF
 404
 405 test_expect_success 'status --porcelain ignores relative paths setting' '
 406
 407         (cd dir1 && git status --porcelain) >output &&
 408         test_cmp expect output
 409
 410 '
 411
 412 test_expect_success 'setup unique colors' '
 413
 414         git config status.color.untracked blue &&
 415         git config status.color.branch green
 416
 417 '
 418
 419 cat >expect <<\EOF
 420 # On branch <GREEN>master<RESET>
 421 # Changes to be committed:
 422 #   (use "git reset HEAD <file>..." to unstage)
 423 #
 424 #       <GREEN>new file:   dir2/added<RESET>
 425 #
 426 # Changes not staged for commit:
 427 #   (use "git add <file>..." to update what will be committed)
 428 #   (use "git checkout -- <file>..." to discard changes in working directory)
 429 #
 430 #       <RED>modified:   dir1/modified<RESET>
 431 #
 432 # Untracked files:
 433 #   (use "git add <file>..." to include in what will be committed)
 434 #
 435 #       <BLUE>dir1/untracked<RESET>
 436 #       <BLUE>dir2/modified<RESET>
 437 #       <BLUE>dir2/untracked<RESET>
 438 #       <BLUE>expect<RESET>
 439 #       <BLUE>output<RESET>
 440 #       <BLUE>untracked<RESET>
 441 EOF
 442
 443 test_expect_success C_LOCALE_OUTPUT 'status with color.ui' '
 444
 445         git config color.ui always &&
 446         test_when_finished "git config --unset color.ui" &&
 447         git status | test_decode_color >output &&
 448         test_cmp expect output
 449
 450 '
 451
 452 test_expect_success C_LOCALE_OUTPUT 'status with color.status' '
 453
 454         git config color.status always &&
 455         test_when_finished "git config --unset color.status" &&
 456         git status | test_decode_color >output &&
 457         test_cmp expect output
 458
 459 '
 460
 461 cat >expect <<\EOF
 462  <RED>M<RESET> dir1/modified
 463 <GREEN>A<RESET>  dir2/added
 464 <BLUE>??<RESET> dir1/untracked
 465 <BLUE>??<RESET> dir2/modified
 466 <BLUE>??<RESET> dir2/untracked
 467 <BLUE>??<RESET> expect
 468 <BLUE>??<RESET> output
 469 <BLUE>??<RESET> untracked
 470 EOF
 471
 472 test_expect_success 'status -s with color.ui' '
 473
 474         git config color.ui always &&
 475         git status -s | test_decode_color >output &&
 476         test_cmp expect output
 477
 478 '
 479
 480 test_expect_success 'status -s with color.status' '
 481
 482         git config --unset color.ui &&
 483         git config color.status always &&
 484         git status -s | test_decode_color >output &&
 485         test_cmp expect output
 486
 487 '
 488
 489 cat >expect <<\EOF
 490 ## <GREEN>master<RESET>
 491  <RED>M<RESET> dir1/modified
 492 <GREEN>A<RESET>  dir2/added
 493 <BLUE>??<RESET> dir1/untracked
 494 <BLUE>??<RESET> dir2/modified
 495 <BLUE>??<RESET> dir2/untracked
 496 <BLUE>??<RESET> expect
 497 <BLUE>??<RESET> output
 498 <BLUE>??<RESET> untracked
 499 EOF
 500
 501 test_expect_success 'status -s -b with color.status' '
 502
 503         git status -s -b | test_decode_color >output &&
 504         test_cmp expect output
 505
 506 '
 507
 508 cat >expect <<\EOF
 509  M dir1/modified
 510 A  dir2/added
 511 ?? dir1/untracked
 512 ?? dir2/modified
 513 ?? dir2/untracked
 514 ?? expect
 515 ?? output
 516 ?? untracked
 517 EOF
 518
 519 test_expect_success 'status --porcelain ignores color.ui' '
 520
 521         git config --unset color.status &&
 522         git config color.ui always &&
 523         git status --porcelain | test_decode_color >output &&
 524         test_cmp expect output
 525
 526 '
 527
 528 test_expect_success 'status --porcelain ignores color.status' '
 529
 530         git config --unset color.ui &&
 531         git config color.status always &&
 532         git status --porcelain | test_decode_color >output &&
 533         test_cmp expect output
 534
 535 '
 536
 537 # recover unconditionally from color tests
 538 git config --unset color.status
 539 git config --unset color.ui
 540
 541 test_expect_success 'status --porcelain ignores -b' '
 542
 543         git status --porcelain -b >output &&
 544         test_cmp expect output
 545
 546 '
 547
 548 cat >expect <<\EOF
 549 # On branch master
 550 # Changes to be committed:
 551 #   (use "git reset HEAD <file>..." to unstage)
 552 #
 553 #       new file:   dir2/added
 554 #
 555 # Changes not staged for commit:
 556 #   (use "git add <file>..." to update what will be committed)
 557 #   (use "git checkout -- <file>..." to discard changes in working directory)
 558 #
 559 #       modified:   dir1/modified
 560 #
 561 # Untracked files:
 562 #   (use "git add <file>..." to include in what will be committed)
 563 #
 564 #       dir1/untracked
 565 #       dir2/modified
 566 #       dir2/untracked
 567 #       expect
 568 #       output
 569 #       untracked
 570 EOF
 571
 572
 573 test_expect_success C_LOCALE_OUTPUT 'status without relative paths' '
 574
 575         git config status.relativePaths false &&
 576         test_when_finished "git config --unset status.relativePaths" &&
 577         (cd dir1 && git status) >output &&
 578         test_cmp expect output
 579
 580 '
 581
 582 cat >expect <<\EOF
 583  M dir1/modified
 584 A  dir2/added
 585 ?? dir1/untracked
 586 ?? dir2/modified
 587 ?? dir2/untracked
 588 ?? expect
 589 ?? output
 590 ?? untracked
 591 EOF
 592
 593 test_expect_success 'status -s without relative paths' '
 594
 595         git config status.relativePaths false &&
 596         test_when_finished "git config --unset status.relativePaths" &&
 597         (cd dir1 && git status -s) >output &&
 598         test_cmp expect output
 599
 600 '
 601
 602 cat <<EOF >expect
 603 # On branch master
 604 # Changes to be committed:
 605 #   (use "git reset HEAD <file>..." to unstage)
 606 #
 607 #       modified:   dir1/modified
 608 #
 609 # Untracked files:
 610 #   (use "git add <file>..." to include in what will be committed)
 611 #
 612 #       dir1/untracked
 613 #       dir2/
 614 #       expect
 615 #       output
 616 #       untracked
 617 EOF
 618 test_expect_success 'dry-run of partial commit excluding new file in index' '
 619         git commit --dry-run dir1/modified >output
 620 '
 621
 622 test_expect_success C_LOCALE_OUTPUT 'dry-run of partial commit excluding new file in index: output' '
 623         test_cmp expect output
 624 '
 625
 626 cat >expect <<EOF
 627 :100644 100644 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 0000000000000000000000000000000000000000 M      dir1/modified
 628 EOF
 629 test_expect_success 'status refreshes the index' '
 630         touch dir2/added &&
 631         git status &&
 632         git diff-files >output &&
 633         test_cmp expect output
 634 '
 635
 636 test_expect_success 'setup status submodule summary' '
 637         test_create_repo sm && (
 638                 cd sm &&
 639                 >foo &&
 640                 git add foo &&
 641                 git commit -m "Add foo"
 642         ) &&
 643         git add sm
 644 '
 645
 646 cat >expect <<EOF
 647 # On branch master
 648 # Changes to be committed:
 649 #   (use "git reset HEAD <file>..." to unstage)
 650 #
 651 #       new file:   dir2/added
 652 #       new file:   sm
 653 #
 654 # Changes not staged for commit:
 655 #   (use "git add <file>..." to update what will be committed)
 656 #   (use "git checkout -- <file>..." to discard changes in working directory)
 657 #
 658 #       modified:   dir1/modified
 659 #
 660 # Untracked files:
 661 #   (use "git add <file>..." to include in what will be committed)
 662 #
 663 #       dir1/untracked
 664 #       dir2/modified
 665 #       dir2/untracked
 666 #       expect
 667 #       output
 668 #       untracked
 669 EOF
 670 test_expect_success C_LOCALE_OUTPUT 'status submodule summary is disabled by default' '
 671         git status >output &&
 672         test_cmp expect output
 673 '
 674
 675 # we expect the same as the previous test
 676 test_expect_success C_LOCALE_OUTPUT 'status --untracked-files=all does not show submodule' '
 677         git status --untracked-files=all >output &&
 678         test_cmp expect output
 679 '
 680
 681 cat >expect <<EOF
 682  M dir1/modified
 683 A  dir2/added
 684 A  sm
 685 ?? dir1/untracked
 686 ?? dir2/modified
 687 ?? dir2/untracked
 688 ?? expect
 689 ?? output
 690 ?? untracked
 691 EOF
 692 test_expect_success 'status -s submodule summary is disabled by default' '
 693         git status -s >output &&
 694         test_cmp expect output
 695 '
 696
 697 # we expect the same as the previous test
 698 test_expect_success 'status -s --untracked-files=all does not show submodule' '
 699         git status -s --untracked-files=all >output &&
 700         test_cmp expect output
 701 '
 702
 703 head=$(cd sm && git rev-parse --short=7 --verify HEAD)
 704
 705 cat >expect <<EOF
 706 # On branch master
 707 # Changes to be committed:
 708 #   (use "git reset HEAD <file>..." to unstage)
 709 #
 710 #       new file:   dir2/added
 711 #       new file:   sm
 712 #
 713 # Changes not staged for commit:
 714 #   (use "git add <file>..." to update what will be committed)
 715 #   (use "git checkout -- <file>..." to discard changes in working directory)
 716 #
 717 #       modified:   dir1/modified
 718 #
 719 # Submodule changes to be committed:
 720 #
 721 # * sm 0000000...$head (1):
 722 #   > Add foo
 723 #
 724 # Untracked files:
 725 #   (use "git add <file>..." to include in what will be committed)
 726 #
 727 #       dir1/untracked
 728 #       dir2/modified
 729 #       dir2/untracked
 730 #       expect
 731 #       output
 732 #       untracked
 733 EOF
 734 test_expect_success C_LOCALE_OUTPUT 'status submodule summary' '
 735         git config status.submodulesummary 10 &&
 736         git status >output &&
 737         if test_have_prereq MINGW
 738         then
 739                 dos2unix output
 740         fi &&
 741         test_cmp expect output
 742 '
 743
 744 cat >expect <<EOF
 745  M dir1/modified
 746 A  dir2/added
 747 A  sm
 748 ?? dir1/untracked
 749 ?? dir2/modified
 750 ?? dir2/untracked
 751 ?? expect
 752 ?? output
 753 ?? untracked
 754 EOF
 755 test_expect_success 'status -s submodule summary' '
 756         git status -s >output &&
 757         if test_have_prereq MINGW
 758         then
 759                 dos2unix output
 760         fi &&
 761         test_cmp expect output
 762 '
 763
 764 cat >expect <<EOF
 765 # On branch master
 766 # Changes not staged for commit:
 767 #   (use "git add <file>..." to update what will be committed)
 768 #   (use "git checkout -- <file>..." to discard changes in working directory)
 769 #
 770 #       modified:   dir1/modified
 771 #
 772 # Untracked files:
 773 #   (use "git add <file>..." to include in what will be committed)
 774 #
 775 #       dir1/untracked
 776 #       dir2/modified
 777 #       dir2/untracked
 778 #       expect
 779 #       output
 780 #       untracked
 781 no changes added to commit (use "git add" and/or "git commit -a")
 782 EOF
 783 test_expect_success 'status submodule summary (clean submodule): commit' '
 784         git commit -m "commit submodule"
 785 '
 786
 787 test_expect_success C_LOCALE_OUTPUT 'status submodule summary (clean submodule): output' '
 788         git config status.submodulesummary 10 &&
 789         test_must_fail git commit --dry-run >output &&
 790         if test_have_prereq MINGW
 791         then
 792                 dos2unix output
 793         fi &&
 794         test_cmp expect output &&
 795         git status >output &&
 796         if test_have_prereq MINGW
 797         then
 798                 dos2unix output
 799         fi &&
 800         test_cmp expect output
 801 '
 802
 803 cat >expect <<EOF
 804  M dir1/modified
 805 ?? dir1/untracked
 806 ?? dir2/modified
 807 ?? dir2/untracked
 808 ?? expect
 809 ?? output
 810 ?? untracked
 811 EOF
 812 test_expect_success 'status -s submodule summary (clean submodule)' '
 813         git status -s >output &&
 814         if test_have_prereq MINGW
 815         then
 816                 dos2unix output
 817         fi &&
 818         test_cmp expect output
 819 '
 820
 821 cat >expect <<EOF
 822 # On branch master
 823 # Changes to be committed:
 824 #   (use "git reset HEAD^1 <file>..." to unstage)
 825 #
 826 #       new file:   dir2/added
 827 #       new file:   sm
 828 #
 829 # Changes not staged for commit:
 830 #   (use "git add <file>..." to update what will be committed)
 831 #   (use "git checkout -- <file>..." to discard changes in working directory)
 832 #
 833 #       modified:   dir1/modified
 834 #
 835 # Submodule changes to be committed:
 836 #
 837 # * sm 0000000...$head (1):
 838 #   > Add foo
 839 #
 840 # Untracked files:
 841 #   (use "git add <file>..." to include in what will be committed)
 842 #
 843 #       dir1/untracked
 844 #       dir2/modified
 845 #       dir2/untracked
 846 #       expect
 847 #       output
 848 #       untracked
 849 EOF
 850 test_expect_success C_LOCALE_OUTPUT 'commit --dry-run submodule summary (--amend)' '
 851         git config status.submodulesummary 10 &&
 852         git commit --dry-run --amend >output &&
 853         if test_have_prereq MINGW
 854         then
 855                 dos2unix output
 856         fi &&
 857         test_cmp expect output
 858 '
 859
 860 test_expect_success POSIXPERM,SANITY 'status succeeds in a read-only repository' '
 861         (
 862                 chmod a-w .git &&
 863                 # make dir1/tracked stat-dirty
 864                 >dir1/tracked1 && mv -f dir1/tracked1 dir1/tracked &&
 865                 git status -s >output &&
 866                 ! grep dir1/tracked output &&
 867                 # make sure "status" succeeded without writing index out
 868                 git diff-files | grep dir1/tracked
 869         )
 870         status=$?
 871         chmod 775 .git
 872         (exit $status)
 873 '
 874
 875 (cd sm && echo > bar && git add bar && git commit -q -m 'Add bar') && git add sm
 876 new_head=$(cd sm && git rev-parse --short=7 --verify HEAD)
 877 touch .gitmodules
 878
 879 cat > expect << EOF
 880 # On branch master
 881 # Changes to be committed:
 882 #   (use "git reset HEAD <file>..." to unstage)
 883 #
 884 #       modified:   sm
 885 #
 886 # Changes not staged for commit:
 887 #   (use "git add <file>..." to update what will be committed)
 888 #   (use "git checkout -- <file>..." to discard changes in working directory)
 889 #
 890 #       modified:   dir1/modified
 891 #
 892 # Submodule changes to be committed:
 893 #
 894 # * sm $head...$new_head (1):
 895 #   > Add bar
 896 #
 897 # Untracked files:
 898 #   (use "git add <file>..." to include in what will be committed)
 899 #
 900 #       .gitmodules
 901 #       dir1/untracked
 902 #       dir2/modified
 903 #       dir2/untracked
 904 #       expect
 905 #       output
 906 #       untracked
 907 EOF
 908
 909 test_expect_success C_LOCALE_OUTPUT '--ignore-submodules=untracked suppresses submodules with untracked content' '
 910         echo modified > sm/untracked &&
 911         git status --ignore-submodules=untracked > output &&
 912         test_cmp expect output
 913 '
 914
 915 test_expect_success C_LOCALE_OUTPUT '.gitmodules ignore=untracked suppresses submodules with untracked content' '
 916         git config diff.ignoreSubmodules dirty &&
 917         git status >output &&
 918         test_cmp expect output &&
 919         git config --add -f .gitmodules submodule.subname.ignore untracked &&
 920         git config --add -f .gitmodules submodule.subname.path sm &&
 921         git status > output &&
 922         test_cmp expect output &&
 923         git config -f .gitmodules  --remove-section submodule.subname &&
 924         git config --unset diff.ignoreSubmodules
 925 '
 926
 927 test_expect_success C_LOCALE_OUTPUT '.git/config ignore=untracked suppresses submodules with untracked content' '
 928         git config --add -f .gitmodules submodule.subname.ignore none &&
 929         git config --add -f .gitmodules submodule.subname.path sm &&
 930         git config --add submodule.subname.ignore untracked &&
 931         git config --add submodule.subname.path sm &&
 932         git status > output &&
 933         test_cmp expect output &&
 934         git config --remove-section submodule.subname &&
 935         git config --remove-section -f .gitmodules submodule.subname
 936 '
 937
 938 test_expect_success C_LOCALE_OUTPUT '--ignore-submodules=dirty suppresses submodules with untracked content' '
 939         git status --ignore-submodules=dirty > output &&
 940         test_cmp expect output
 941 '
 942
 943 test_expect_success C_LOCALE_OUTPUT '.gitmodules ignore=dirty suppresses submodules with untracked content' '
 944         git config diff.ignoreSubmodules dirty &&
 945         git status >output &&
 946         ! test -s actual &&
 947         git config --add -f .gitmodules submodule.subname.ignore dirty &&
 948         git config --add -f .gitmodules submodule.subname.path sm &&
 949         git status > output &&
 950         test_cmp expect output &&
 951         git config -f .gitmodules  --remove-section submodule.subname &&
 952         git config --unset diff.ignoreSubmodules
 953 '
 954
 955 test_expect_success C_LOCALE_OUTPUT '.git/config ignore=dirty suppresses submodules with untracked content' '
 956         git config --add -f .gitmodules submodule.subname.ignore none &&
 957         git config --add -f .gitmodules submodule.subname.path sm &&
 958         git config --add submodule.subname.ignore dirty &&
 959         git config --add submodule.subname.path sm &&
 960         git status > output &&
 961         test_cmp expect output &&
 962         git config --remove-section submodule.subname &&
 963         git config -f .gitmodules  --remove-section submodule.subname
 964 '
 965
 966 test_expect_success C_LOCALE_OUTPUT '--ignore-submodules=dirty suppresses submodules with modified content' '
 967         echo modified > sm/foo &&
 968         git status --ignore-submodules=dirty > output &&
 969         test_cmp expect output
 970 '
 971
 972 test_expect_success C_LOCALE_OUTPUT '.gitmodules ignore=dirty suppresses submodules with modified content' '
 973         git config --add -f .gitmodules submodule.subname.ignore dirty &&
 974         git config --add -f .gitmodules submodule.subname.path sm &&
 975         git status > output &&
 976         test_cmp expect output &&
 977         git config -f .gitmodules  --remove-section submodule.subname
 978 '
 979
 980 test_expect_success C_LOCALE_OUTPUT '.git/config ignore=dirty suppresses submodules with modified content' '
 981         git config --add -f .gitmodules submodule.subname.ignore none &&
 982         git config --add -f .gitmodules submodule.subname.path sm &&
 983         git config --add submodule.subname.ignore dirty &&
 984         git config --add submodule.subname.path sm &&
 985         git status > output &&
 986         test_cmp expect output &&
 987         git config --remove-section submodule.subname &&
 988         git config -f .gitmodules  --remove-section submodule.subname
 989 '
 990
 991 cat > expect << EOF
 992 # On branch master
 993 # Changes to be committed:
 994 #   (use "git reset HEAD <file>..." to unstage)
 995 #
 996 #       modified:   sm
 997 #
 998 # Changes not staged for commit:
 999 #   (use "git add <file>..." to update what will be committed)
1000 #   (use "git checkout -- <file>..." to discard changes in working directory)
1001 #   (commit or discard the untracked or modified content in submodules)
1002 #
1003 #       modified:   dir1/modified
1004 #       modified:   sm (modified content)
1005 #
1006 # Submodule changes to be committed:
1007 #
1008 # * sm $head...$new_head (1):
1009 #   > Add bar
1010 #
1011 # Untracked files:
1012 #   (use "git add <file>..." to include in what will be committed)
1013 #
1014 #       .gitmodules
1015 #       dir1/untracked
1016 #       dir2/modified
1017 #       dir2/untracked
1018 #       expect
1019 #       output
1020 #       untracked
1021 EOF
1022
1023 test_expect_success C_LOCALE_OUTPUT "--ignore-submodules=untracked doesn't suppress submodules with modified content" '
1024         git status --ignore-submodules=untracked > output &&
1025         test_cmp expect output
1026 '
1027
1028 test_expect_success C_LOCALE_OUTPUT ".gitmodules ignore=untracked doesn't suppress submodules with modified content" '
1029         git config --add -f .gitmodules submodule.subname.ignore untracked &&
1030         git config --add -f .gitmodules submodule.subname.path sm &&
1031         git status > output &&
1032         test_cmp expect output &&
1033         git config -f .gitmodules  --remove-section submodule.subname
1034 '
1035
1036 test_expect_success C_LOCALE_OUTPUT ".git/config ignore=untracked doesn't suppress submodules with modified content" '
1037         git config --add -f .gitmodules submodule.subname.ignore none &&
1038         git config --add -f .gitmodules submodule.subname.path sm &&
1039         git config --add submodule.subname.ignore untracked &&
1040         git config --add submodule.subname.path sm &&
1041         git status > output &&
1042         test_cmp expect output &&
1043         git config --remove-section submodule.subname &&
1044         git config -f .gitmodules  --remove-section submodule.subname
1045 '
1046
1047 head2=$(cd sm && git commit -q -m "2nd commit" foo && git rev-parse --short=7 --verify HEAD)
1048
1049 cat > expect << EOF
1050 # On branch master
1051 # Changes to be committed:
1052 #   (use "git reset HEAD <file>..." to unstage)
1053 #
1054 #       modified:   sm
1055 #
1056 # Changes not staged for commit:
1057 #   (use "git add <file>..." to update what will be committed)
1058 #   (use "git checkout -- <file>..." to discard changes in working directory)
1059 #
1060 #       modified:   dir1/modified
1061 #       modified:   sm (new commits)
1062 #
1063 # Submodule changes to be committed:
1064 #
1065 # * sm $head...$new_head (1):
1066 #   > Add bar
1067 #
1068 # Submodules changed but not updated:
1069 #
1070 # * sm $new_head...$head2 (1):
1071 #   > 2nd commit
1072 #
1073 # Untracked files:
1074 #   (use "git add <file>..." to include in what will be committed)
1075 #
1076 #       .gitmodules
1077 #       dir1/untracked
1078 #       dir2/modified
1079 #       dir2/untracked
1080 #       expect
1081 #       output
1082 #       untracked
1083 EOF
1084
1085 test_expect_success C_LOCALE_OUTPUT "--ignore-submodules=untracked doesn't suppress submodule summary" '
1086         git status --ignore-submodules=untracked > output &&
1087         test_cmp expect output
1088 '
1089
1090 test_expect_success C_LOCALE_OUTPUT ".gitmodules ignore=untracked doesn't suppress submodule summary" '
1091         git config --add -f .gitmodules submodule.subname.ignore untracked &&
1092         git config --add -f .gitmodules submodule.subname.path sm &&
1093         git status > output &&
1094         test_cmp expect output &&
1095         git config -f .gitmodules  --remove-section submodule.subname
1096 '
1097
1098 test_expect_success C_LOCALE_OUTPUT ".git/config ignore=untracked doesn't suppress submodule summary" '
1099         git config --add -f .gitmodules submodule.subname.ignore none &&
1100         git config --add -f .gitmodules submodule.subname.path sm &&
1101         git config --add submodule.subname.ignore untracked &&
1102         git config --add submodule.subname.path sm &&
1103         git status > output &&
1104         test_cmp expect output &&
1105         git config --remove-section submodule.subname &&
1106         git config -f .gitmodules  --remove-section submodule.subname
1107 '
1108
1109 test_expect_success C_LOCALE_OUTPUT "--ignore-submodules=dirty doesn't suppress submodule summary" '
1110         git status --ignore-submodules=dirty > output &&
1111         test_cmp expect output
1112 '
1113 test_expect_success C_LOCALE_OUTPUT ".gitmodules ignore=dirty doesn't suppress submodule summary" '
1114         git config --add -f .gitmodules submodule.subname.ignore dirty &&
1115         git config --add -f .gitmodules submodule.subname.path sm &&
1116         git status > output &&
1117         test_cmp expect output &&
1118         git config -f .gitmodules  --remove-section submodule.subname
1119 '
1120
1121 test_expect_success C_LOCALE_OUTPUT ".git/config ignore=dirty doesn't suppress submodule summary" '
1122         git config --add -f .gitmodules submodule.subname.ignore none &&
1123         git config --add -f .gitmodules submodule.subname.path sm &&
1124         git config --add submodule.subname.ignore dirty &&
1125         git config --add submodule.subname.path sm &&
1126         git status > output &&
1127         test_cmp expect output &&
1128         git config --remove-section submodule.subname &&
1129         git config -f .gitmodules  --remove-section submodule.subname
1130 '
1131
1132 cat > expect << EOF
1133 # On branch master
1134 # Changes not staged for commit:
1135 #   (use "git add <file>..." to update what will be committed)
1136 #   (use "git checkout -- <file>..." to discard changes in working directory)
1137 #
1138 #       modified:   dir1/modified
1139 #
1140 # Untracked files:
1141 #   (use "git add <file>..." to include in what will be committed)
1142 #
1143 #       .gitmodules
1144 #       dir1/untracked
1145 #       dir2/modified
1146 #       dir2/untracked
1147 #       expect
1148 #       output
1149 #       untracked
1150 no changes added to commit (use "git add" and/or "git commit -a")
1151 EOF
1152
1153 test_expect_success C_LOCALE_OUTPUT "--ignore-submodules=all suppresses submodule summary" '
1154         git status --ignore-submodules=all > output &&
1155         test_cmp expect output
1156 '
1157
1158 test_expect_failure '.gitmodules ignore=all suppresses submodule summary' '
1159         git config --add -f .gitmodules submodule.subname.ignore all &&
1160         git config --add -f .gitmodules submodule.subname.path sm &&
1161         git status > output &&
1162         test_cmp expect output &&
1163         git config -f .gitmodules  --remove-section submodule.subname
1164 '
1165
1166 test_expect_failure '.git/config ignore=all suppresses submodule summary' '
1167         git config --add -f .gitmodules submodule.subname.ignore none &&
1168         git config --add -f .gitmodules submodule.subname.path sm &&
1169         git config --add submodule.subname.ignore all &&
1170         git config --add submodule.subname.path sm &&
1171         git status > output &&
1172         test_cmp expect output &&
1173         git config --remove-section submodule.subname &&
1174         git config -f .gitmodules  --remove-section submodule.subname
1175 '
1176
1177 test_done