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_PASSES_SANITIZE_LEAK=true
   9 . ./test-lib.sh
  10 . "$TEST_DIRECTORY"/lib-terminal.sh
  11
  12 test_expect_success 'status -h in broken repository' '
  13         git config --global advice.statusuoption false &&
  14         mkdir broken &&
  15         test_when_finished "rm -fr broken" &&
  16         (
  17                 cd broken &&
  18                 git init &&
  19                 echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
  20                 test_expect_code 129 git status -h >usage 2>&1
  21         ) &&
  22         test_i18ngrep "[Uu]sage" broken/usage
  23 '
  24
  25 test_expect_success 'commit -h in broken repository' '
  26         mkdir broken &&
  27         test_when_finished "rm -fr broken" &&
  28         (
  29                 cd broken &&
  30                 git init &&
  31                 echo "[status] showuntrackedfiles = CORRUPT" >>.git/config &&
  32                 test_expect_code 129 git commit -h >usage 2>&1
  33         ) &&
  34         test_i18ngrep "[Uu]sage" broken/usage
  35 '
  36
  37 test_expect_success 'create upstream branch' '
  38         git checkout -b upstream &&
  39         test_commit upstream1 &&
  40         test_commit upstream2 &&
  41         # leave the first commit on main as root because several
  42         # tests depend on this case; for our upstream we only
  43         # care about commit counts anyway, so a totally divergent
  44         # history is OK
  45         git checkout --orphan main
  46 '
  47
  48 test_expect_success 'setup' '
  49         : >tracked &&
  50         : >modified &&
  51         mkdir dir1 &&
  52         : >dir1/tracked &&
  53         : >dir1/modified &&
  54         mkdir dir2 &&
  55         : >dir1/tracked &&
  56         : >dir1/modified &&
  57         git add . &&
  58
  59         git status >output &&
  60
  61         test_tick &&
  62         git commit -m initial &&
  63         : >untracked &&
  64         : >dir1/untracked &&
  65         : >dir2/untracked &&
  66         echo 1 >dir1/modified &&
  67         echo 2 >dir2/modified &&
  68         echo 3 >dir2/added &&
  69         git add dir2/added &&
  70
  71         git branch --set-upstream-to=upstream
  72 '
  73
  74 test_expect_success 'status (1)' '
  75         test_i18ngrep "use \"git rm --cached <file>\.\.\.\" to unstage" output
  76 '
  77
  78 strip_comments () {
  79         tab='   '
  80         sed "s/^\# //; s/^\#$//; s/^#$tab/$tab/" <"$1" >"$1".tmp &&
  81         rm "$1" && mv "$1".tmp "$1"
  82 }
  83
  84 cat >.gitignore <<\EOF
  85 .gitignore
  86 expect*
  87 output*
  88 EOF
  89
  90 test_expect_success 'status --column' '
  91         cat >expect <<\EOF &&
  92 # On branch main
  93 # Your branch and '\''upstream'\'' have diverged,
  94 # and have 1 and 2 different commits each, respectively.
  95 #   (use "git pull" if you want to integrate the remote branch with yours)
  96 #
  97 # Changes to be committed:
  98 #   (use "git restore --staged <file>..." to unstage)
  99 #       new file:   dir2/added
 100 #
 101 # Changes not staged for commit:
 102 #   (use "git add <file>..." to update what will be committed)
 103 #   (use "git restore <file>..." to discard changes in working directory)
 104 #       modified:   dir1/modified
 105 #
 106 # Untracked files:
 107 #   (use "git add <file>..." to include in what will be committed)
 108 #       dir1/untracked dir2/untracked
 109 #       dir2/modified  untracked
 110 #
 111 EOF
 112         COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output &&
 113         test_cmp expect output
 114 '
 115
 116 test_expect_success 'status --column status.displayCommentPrefix=false' '
 117         strip_comments expect &&
 118         COLUMNS=49 git -c status.displayCommentPrefix=false status --column="column dense" >output &&
 119         test_cmp expect output
 120 '
 121
 122 cat >expect <<\EOF
 123 # On branch main
 124 # Your branch and 'upstream' have diverged,
 125 # and have 1 and 2 different commits each, respectively.
 126 #   (use "git pull" if you want to integrate the remote branch with yours)
 127 #
 128 # Changes to be committed:
 129 #   (use "git restore --staged <file>..." to unstage)
 130 #       new file:   dir2/added
 131 #
 132 # Changes not staged for commit:
 133 #   (use "git add <file>..." to update what will be committed)
 134 #   (use "git restore <file>..." to discard changes in working directory)
 135 #       modified:   dir1/modified
 136 #
 137 # Untracked files:
 138 #   (use "git add <file>..." to include in what will be committed)
 139 #       dir1/untracked
 140 #       dir2/modified
 141 #       dir2/untracked
 142 #       untracked
 143 #
 144 EOF
 145
 146 test_expect_success 'status with status.displayCommentPrefix=true' '
 147         git -c status.displayCommentPrefix=true status >output &&
 148         test_cmp expect output
 149 '
 150
 151 test_expect_success 'status with status.displayCommentPrefix=false' '
 152         strip_comments expect &&
 153         git -c status.displayCommentPrefix=false status >output &&
 154         test_cmp expect output
 155 '
 156
 157 test_expect_success 'status -v' '
 158         (cat expect && git diff --cached) >expect-with-v &&
 159         git status -v >output &&
 160         test_cmp expect-with-v output
 161 '
 162
 163 test_expect_success 'status -v -v' '
 164         (cat expect &&
 165          echo "Changes to be committed:" &&
 166          git -c diff.mnemonicprefix=true diff --cached &&
 167          echo "--------------------------------------------------" &&
 168          echo "Changes not staged for commit:" &&
 169          git -c diff.mnemonicprefix=true diff) >expect-with-v &&
 170         git status -v -v >output &&
 171         test_cmp expect-with-v output
 172 '
 173
 174 test_expect_success 'setup fake editor' '
 175         cat >.git/editor <<-\EOF &&
 176         #! /bin/sh
 177         cp "$1" output
 178 EOF
 179         chmod 755 .git/editor
 180 '
 181
 182 commit_template_commented () {
 183         (
 184                 EDITOR=.git/editor &&
 185                 export EDITOR &&
 186                 # Fails due to empty message
 187                 test_must_fail git commit
 188         ) &&
 189         ! grep '^[^#]' output
 190 }
 191
 192 test_expect_success 'commit ignores status.displayCommentPrefix=false in COMMIT_EDITMSG' '
 193         commit_template_commented
 194 '
 195
 196 cat >expect <<\EOF
 197 On branch main
 198 Your branch and 'upstream' have diverged,
 199 and have 1 and 2 different commits each, respectively.
 200
 201 Changes to be committed:
 202         new file:   dir2/added
 203
 204 Changes not staged for commit:
 205         modified:   dir1/modified
 206
 207 Untracked files:
 208         dir1/untracked
 209         dir2/modified
 210         dir2/untracked
 211         untracked
 212
 213 EOF
 214
 215 test_expect_success 'status (advice.statusHints false)' '
 216         test_config advice.statusHints false &&
 217         git status >output &&
 218         test_cmp expect output
 219
 220 '
 221
 222 cat >expect <<\EOF
 223  M dir1/modified
 224 A  dir2/added
 225 ?? dir1/untracked
 226 ?? dir2/modified
 227 ?? dir2/untracked
 228 ?? untracked
 229 EOF
 230
 231 test_expect_success 'status -s' '
 232
 233         git status -s >output &&
 234         test_cmp expect output
 235
 236 '
 237
 238 test_expect_success 'status with gitignore' '
 239         {
 240                 echo ".gitignore" &&
 241                 echo "expect*" &&
 242                 echo "output" &&
 243                 echo "untracked"
 244         } >.gitignore &&
 245
 246         cat >expect <<-\EOF &&
 247          M dir1/modified
 248         A  dir2/added
 249         ?? dir2/modified
 250         EOF
 251         git status -s >output &&
 252         test_cmp expect output &&
 253
 254         cat >expect <<-\EOF &&
 255          M dir1/modified
 256         A  dir2/added
 257         ?? dir2/modified
 258         !! .gitignore
 259         !! dir1/untracked
 260         !! dir2/untracked
 261         !! expect
 262         !! expect-with-v
 263         !! output
 264         !! untracked
 265         EOF
 266         git status -s --ignored >output &&
 267         test_cmp expect output &&
 268
 269         cat >expect <<\EOF &&
 270 On branch main
 271 Your branch and '\''upstream'\'' have diverged,
 272 and have 1 and 2 different commits each, respectively.
 273   (use "git pull" if you want to integrate the remote branch with yours)
 274
 275 Changes to be committed:
 276   (use "git restore --staged <file>..." to unstage)
 277         new file:   dir2/added
 278
 279 Changes not staged for commit:
 280   (use "git add <file>..." to update what will be committed)
 281   (use "git restore <file>..." to discard changes in working directory)
 282         modified:   dir1/modified
 283
 284 Untracked files:
 285   (use "git add <file>..." to include in what will be committed)
 286         dir2/modified
 287
 288 Ignored files:
 289   (use "git add -f <file>..." to include in what will be committed)
 290         .gitignore
 291         dir1/untracked
 292         dir2/untracked
 293         expect
 294         expect-with-v
 295         output
 296         untracked
 297
 298 EOF
 299         git status --ignored >output &&
 300         test_cmp expect output
 301 '
 302
 303 test_expect_success 'status with gitignore (nothing untracked)' '
 304         {
 305                 echo ".gitignore" &&
 306                 echo "expect*" &&
 307                 echo "dir2/modified" &&
 308                 echo "output" &&
 309                 echo "untracked"
 310         } >.gitignore &&
 311
 312         cat >expect <<-\EOF &&
 313          M dir1/modified
 314         A  dir2/added
 315         EOF
 316         git status -s >output &&
 317         test_cmp expect output &&
 318
 319         cat >expect <<-\EOF &&
 320          M dir1/modified
 321         A  dir2/added
 322         !! .gitignore
 323         !! dir1/untracked
 324         !! dir2/modified
 325         !! dir2/untracked
 326         !! expect
 327         !! expect-with-v
 328         !! output
 329         !! untracked
 330         EOF
 331         git status -s --ignored >output &&
 332         test_cmp expect output &&
 333
 334         cat >expect <<\EOF &&
 335 On branch main
 336 Your branch and '\''upstream'\'' have diverged,
 337 and have 1 and 2 different commits each, respectively.
 338   (use "git pull" if you want to integrate the remote branch with yours)
 339
 340 Changes to be committed:
 341   (use "git restore --staged <file>..." to unstage)
 342         new file:   dir2/added
 343
 344 Changes not staged for commit:
 345   (use "git add <file>..." to update what will be committed)
 346   (use "git restore <file>..." to discard changes in working directory)
 347         modified:   dir1/modified
 348
 349 Ignored files:
 350   (use "git add -f <file>..." to include in what will be committed)
 351         .gitignore
 352         dir1/untracked
 353         dir2/modified
 354         dir2/untracked
 355         expect
 356         expect-with-v
 357         output
 358         untracked
 359
 360 EOF
 361         git status --ignored >output &&
 362         test_cmp expect output
 363 '
 364
 365 cat >.gitignore <<\EOF
 366 .gitignore
 367 expect*
 368 output*
 369 EOF
 370
 371 cat >expect <<\EOF
 372 ## main...upstream [ahead 1, behind 2]
 373  M dir1/modified
 374 A  dir2/added
 375 ?? dir1/untracked
 376 ?? dir2/modified
 377 ?? dir2/untracked
 378 ?? untracked
 379 EOF
 380
 381 test_expect_success 'status -s -b' '
 382
 383         git status -s -b >output &&
 384         test_cmp expect output
 385
 386 '
 387
 388 test_expect_success 'status -s -z -b' '
 389         tr "\\n" Q <expect >expect.q &&
 390         mv expect.q expect &&
 391         git status -s -z -b >output &&
 392         nul_to_q <output >output.q &&
 393         mv output.q output &&
 394         test_cmp expect output
 395 '
 396
 397 test_expect_success 'setup dir3' '
 398         mkdir dir3 &&
 399         : >dir3/untracked1 &&
 400         : >dir3/untracked2
 401 '
 402
 403 test_expect_success 'status -uno' '
 404         cat >expect <<EOF &&
 405 On branch main
 406 Your branch and '\''upstream'\'' have diverged,
 407 and have 1 and 2 different commits each, respectively.
 408   (use "git pull" if you want to integrate the remote branch with yours)
 409
 410 Changes to be committed:
 411   (use "git restore --staged <file>..." to unstage)
 412         new file:   dir2/added
 413
 414 Changes not staged for commit:
 415   (use "git add <file>..." to update what will be committed)
 416   (use "git restore <file>..." to discard changes in working directory)
 417         modified:   dir1/modified
 418
 419 Untracked files not listed (use -u option to show untracked files)
 420 EOF
 421         git status -uno >output &&
 422         test_cmp expect output
 423 '
 424
 425 test_expect_success 'status (status.showUntrackedFiles no)' '
 426         test_config status.showuntrackedfiles no &&
 427         git status >output &&
 428         test_cmp expect output
 429 '
 430
 431 test_expect_success 'status -uno (advice.statusHints false)' '
 432         cat >expect <<EOF &&
 433 On branch main
 434 Your branch and '\''upstream'\'' have diverged,
 435 and have 1 and 2 different commits each, respectively.
 436
 437 Changes to be committed:
 438         new file:   dir2/added
 439
 440 Changes not staged for commit:
 441         modified:   dir1/modified
 442
 443 Untracked files not listed
 444 EOF
 445         test_config advice.statusHints false &&
 446         git status -uno >output &&
 447         test_cmp expect output
 448 '
 449
 450 cat >expect << EOF
 451  M dir1/modified
 452 A  dir2/added
 453 EOF
 454 test_expect_success 'status -s -uno' '
 455         git status -s -uno >output &&
 456         test_cmp expect output
 457 '
 458
 459 test_expect_success 'status -s (status.showUntrackedFiles no)' '
 460         git config status.showuntrackedfiles no &&
 461         git status -s >output &&
 462         test_cmp expect output
 463 '
 464
 465 test_expect_success 'status -unormal' '
 466         cat >expect <<EOF &&
 467 On branch main
 468 Your branch and '\''upstream'\'' have diverged,
 469 and have 1 and 2 different commits each, respectively.
 470   (use "git pull" if you want to integrate the remote branch with yours)
 471
 472 Changes to be committed:
 473   (use "git restore --staged <file>..." to unstage)
 474         new file:   dir2/added
 475
 476 Changes not staged for commit:
 477   (use "git add <file>..." to update what will be committed)
 478   (use "git restore <file>..." to discard changes in working directory)
 479         modified:   dir1/modified
 480
 481 Untracked files:
 482   (use "git add <file>..." to include in what will be committed)
 483         dir1/untracked
 484         dir2/modified
 485         dir2/untracked
 486         dir3/
 487         untracked
 488
 489 EOF
 490         git status -unormal >output &&
 491         test_cmp expect output
 492 '
 493
 494 test_expect_success 'status (status.showUntrackedFiles normal)' '
 495         test_config status.showuntrackedfiles normal &&
 496         git status >output &&
 497         test_cmp expect output
 498 '
 499
 500 cat >expect <<EOF
 501  M dir1/modified
 502 A  dir2/added
 503 ?? dir1/untracked
 504 ?? dir2/modified
 505 ?? dir2/untracked
 506 ?? dir3/
 507 ?? untracked
 508 EOF
 509 test_expect_success 'status -s -unormal' '
 510         git status -s -unormal >output &&
 511         test_cmp expect output
 512 '
 513
 514 test_expect_success 'status -s (status.showUntrackedFiles normal)' '
 515         git config status.showuntrackedfiles normal &&
 516         git status -s >output &&
 517         test_cmp expect output
 518 '
 519
 520 test_expect_success 'status -uall' '
 521         cat >expect <<EOF &&
 522 On branch main
 523 Your branch and '\''upstream'\'' have diverged,
 524 and have 1 and 2 different commits each, respectively.
 525   (use "git pull" if you want to integrate the remote branch with yours)
 526
 527 Changes to be committed:
 528   (use "git restore --staged <file>..." to unstage)
 529         new file:   dir2/added
 530
 531 Changes not staged for commit:
 532   (use "git add <file>..." to update what will be committed)
 533   (use "git restore <file>..." to discard changes in working directory)
 534         modified:   dir1/modified
 535
 536 Untracked files:
 537   (use "git add <file>..." to include in what will be committed)
 538         dir1/untracked
 539         dir2/modified
 540         dir2/untracked
 541         dir3/untracked1
 542         dir3/untracked2
 543         untracked
 544
 545 EOF
 546         git status -uall >output &&
 547         test_cmp expect output
 548 '
 549
 550 test_expect_success 'status (status.showUntrackedFiles all)' '
 551         test_config status.showuntrackedfiles all &&
 552         git status >output &&
 553         test_cmp expect output
 554 '
 555
 556 test_expect_success 'teardown dir3' '
 557         rm -rf dir3
 558 '
 559
 560 cat >expect <<EOF
 561  M dir1/modified
 562 A  dir2/added
 563 ?? dir1/untracked
 564 ?? dir2/modified
 565 ?? dir2/untracked
 566 ?? untracked
 567 EOF
 568 test_expect_success 'status -s -uall' '
 569         test_unconfig status.showuntrackedfiles &&
 570         git status -s -uall >output &&
 571         test_cmp expect output
 572 '
 573 test_expect_success 'status -s (status.showUntrackedFiles all)' '
 574         test_config status.showuntrackedfiles all &&
 575         git status -s >output &&
 576         rm -rf dir3 &&
 577         test_cmp expect output
 578 '
 579
 580 test_expect_success 'status with relative paths' '
 581         cat >expect <<\EOF &&
 582 On branch main
 583 Your branch and '\''upstream'\'' have diverged,
 584 and have 1 and 2 different commits each, respectively.
 585   (use "git pull" if you want to integrate the remote branch with yours)
 586
 587 Changes to be committed:
 588   (use "git restore --staged <file>..." to unstage)
 589         new file:   ../dir2/added
 590
 591 Changes not staged for commit:
 592   (use "git add <file>..." to update what will be committed)
 593   (use "git restore <file>..." to discard changes in working directory)
 594         modified:   modified
 595
 596 Untracked files:
 597   (use "git add <file>..." to include in what will be committed)
 598         untracked
 599         ../dir2/modified
 600         ../dir2/untracked
 601         ../untracked
 602
 603 EOF
 604         (cd dir1 && git status) >output &&
 605         test_cmp expect output
 606 '
 607
 608 cat >expect <<\EOF
 609  M modified
 610 A  ../dir2/added
 611 ?? untracked
 612 ?? ../dir2/modified
 613 ?? ../dir2/untracked
 614 ?? ../untracked
 615 EOF
 616 test_expect_success 'status -s with relative paths' '
 617
 618         (cd dir1 && git status -s) >output &&
 619         test_cmp expect output
 620
 621 '
 622
 623 cat >expect <<\EOF
 624  M dir1/modified
 625 A  dir2/added
 626 ?? dir1/untracked
 627 ?? dir2/modified
 628 ?? dir2/untracked
 629 ?? untracked
 630 EOF
 631
 632 test_expect_success 'status --porcelain ignores relative paths setting' '
 633
 634         (cd dir1 && git status --porcelain) >output &&
 635         test_cmp expect output
 636
 637 '
 638
 639 test_expect_success 'setup unique colors' '
 640
 641         git config status.color.untracked blue &&
 642         git config status.color.branch green &&
 643         git config status.color.localBranch yellow &&
 644         git config status.color.remoteBranch cyan
 645
 646 '
 647
 648 test_expect_success TTY 'status with color.ui' '
 649         cat >expect <<\EOF &&
 650 On branch <GREEN>main<RESET>
 651 Your branch and '\''upstream'\'' have diverged,
 652 and have 1 and 2 different commits each, respectively.
 653   (use "git pull" if you want to integrate the remote branch with yours)
 654
 655 Changes to be committed:
 656   (use "git restore --staged <file>..." to unstage)
 657         <GREEN>new file:   dir2/added<RESET>
 658
 659 Changes not staged for commit:
 660   (use "git add <file>..." to update what will be committed)
 661   (use "git restore <file>..." to discard changes in working directory)
 662         <RED>modified:   dir1/modified<RESET>
 663
 664 Untracked files:
 665   (use "git add <file>..." to include in what will be committed)
 666         <BLUE>dir1/untracked<RESET>
 667         <BLUE>dir2/modified<RESET>
 668         <BLUE>dir2/untracked<RESET>
 669         <BLUE>untracked<RESET>
 670
 671 EOF
 672         test_config color.ui auto &&
 673         test_terminal git status | test_decode_color >output &&
 674         test_cmp expect output
 675 '
 676
 677 test_expect_success TTY 'status with color.status' '
 678         test_config color.status auto &&
 679         test_terminal git status | test_decode_color >output &&
 680         test_cmp expect output
 681 '
 682
 683 cat >expect <<\EOF
 684  <RED>M<RESET> dir1/modified
 685 <GREEN>A<RESET>  dir2/added
 686 <BLUE>??<RESET> dir1/untracked
 687 <BLUE>??<RESET> dir2/modified
 688 <BLUE>??<RESET> dir2/untracked
 689 <BLUE>??<RESET> untracked
 690 EOF
 691
 692 test_expect_success TTY 'status -s with color.ui' '
 693
 694         git config color.ui auto &&
 695         test_terminal git status -s | test_decode_color >output &&
 696         test_cmp expect output
 697
 698 '
 699
 700 test_expect_success TTY 'status -s with color.status' '
 701
 702         git config --unset color.ui &&
 703         git config color.status auto &&
 704         test_terminal git status -s | test_decode_color >output &&
 705         test_cmp expect output
 706
 707 '
 708
 709 cat >expect <<\EOF
 710 ## <YELLOW>main<RESET>...<CYAN>upstream<RESET> [ahead <YELLOW>1<RESET>, behind <CYAN>2<RESET>]
 711  <RED>M<RESET> dir1/modified
 712 <GREEN>A<RESET>  dir2/added
 713 <BLUE>??<RESET> dir1/untracked
 714 <BLUE>??<RESET> dir2/modified
 715 <BLUE>??<RESET> dir2/untracked
 716 <BLUE>??<RESET> untracked
 717 EOF
 718
 719 test_expect_success TTY 'status -s -b with color.status' '
 720
 721         test_terminal git status -s -b | test_decode_color >output &&
 722         test_cmp expect output
 723
 724 '
 725
 726 cat >expect <<\EOF
 727  M dir1/modified
 728 A  dir2/added
 729 ?? dir1/untracked
 730 ?? dir2/modified
 731 ?? dir2/untracked
 732 ?? untracked
 733 EOF
 734
 735 test_expect_success TTY 'status --porcelain ignores color.ui' '
 736
 737         git config --unset color.status &&
 738         git config color.ui auto &&
 739         test_terminal git status --porcelain | test_decode_color >output &&
 740         test_cmp expect output
 741
 742 '
 743
 744 test_expect_success TTY 'status --porcelain ignores color.status' '
 745
 746         git config --unset color.ui &&
 747         git config color.status auto &&
 748         test_terminal git status --porcelain | test_decode_color >output &&
 749         test_cmp expect output
 750
 751 '
 752
 753 # recover unconditionally from color tests
 754 git config --unset color.status
 755 git config --unset color.ui
 756
 757 test_expect_success 'status --porcelain respects -b' '
 758
 759         git status --porcelain -b >output &&
 760         {
 761                 echo "## main...upstream [ahead 1, behind 2]" &&
 762                 cat expect
 763         } >tmp &&
 764         mv tmp expect &&
 765         test_cmp expect output
 766
 767 '
 768
 769
 770
 771 test_expect_success 'status without relative paths' '
 772         cat >expect <<\EOF &&
 773 On branch main
 774 Your branch and '\''upstream'\'' have diverged,
 775 and have 1 and 2 different commits each, respectively.
 776   (use "git pull" if you want to integrate the remote branch with yours)
 777
 778 Changes to be committed:
 779   (use "git restore --staged <file>..." to unstage)
 780         new file:   dir2/added
 781
 782 Changes not staged for commit:
 783   (use "git add <file>..." to update what will be committed)
 784   (use "git restore <file>..." to discard changes in working directory)
 785         modified:   dir1/modified
 786
 787 Untracked files:
 788   (use "git add <file>..." to include in what will be committed)
 789         dir1/untracked
 790         dir2/modified
 791         dir2/untracked
 792         untracked
 793
 794 EOF
 795         test_config status.relativePaths false &&
 796         (cd dir1 && git status) >output &&
 797         test_cmp expect output
 798
 799 '
 800
 801 cat >expect <<\EOF
 802  M dir1/modified
 803 A  dir2/added
 804 ?? dir1/untracked
 805 ?? dir2/modified
 806 ?? dir2/untracked
 807 ?? untracked
 808 EOF
 809
 810 test_expect_success 'status -s without relative paths' '
 811
 812         test_config status.relativePaths false &&
 813         (cd dir1 && git status -s) >output &&
 814         test_cmp expect output
 815
 816 '
 817
 818 cat >expect <<\EOF
 819  M dir1/modified
 820 A  dir2/added
 821 A  "file with spaces"
 822 ?? dir1/untracked
 823 ?? dir2/modified
 824 ?? dir2/untracked
 825 ?? "file with spaces 2"
 826 ?? untracked
 827 EOF
 828
 829 test_expect_success 'status -s without relative paths' '
 830         test_when_finished "git rm --cached \"file with spaces\"; rm -f file*" &&
 831         >"file with spaces" &&
 832         >"file with spaces 2" &&
 833         >"expect with spaces" &&
 834         git add "file with spaces" &&
 835
 836         git status -s >output &&
 837         test_cmp expect output &&
 838
 839         git status -s --ignored >output &&
 840         grep "^!! \"expect with spaces\"$" output &&
 841         grep -v "^!! " output >output-wo-ignored &&
 842         test_cmp expect output-wo-ignored
 843 '
 844
 845 test_expect_success 'dry-run of partial commit excluding new file in index' '
 846         cat >expect <<EOF &&
 847 On branch main
 848 Your branch and '\''upstream'\'' have diverged,
 849 and have 1 and 2 different commits each, respectively.
 850
 851 Changes to be committed:
 852   (use "git restore --staged <file>..." to unstage)
 853         modified:   dir1/modified
 854
 855 Untracked files:
 856   (use "git add <file>..." to include in what will be committed)
 857         dir1/untracked
 858         dir2/
 859         untracked
 860
 861 EOF
 862         git commit --dry-run dir1/modified >output &&
 863         test_cmp expect output
 864 '
 865
 866 cat >expect <<EOF
 867 :100644 100644 $EMPTY_BLOB $ZERO_OID M  dir1/modified
 868 EOF
 869 test_expect_success 'status refreshes the index' '
 870         touch dir2/added &&
 871         git status &&
 872         git diff-files >output &&
 873         test_cmp expect output
 874 '
 875
 876 test_expect_success 'status shows detached HEAD properly after checking out non-local upstream branch' '
 877         test_when_finished rm -rf upstream downstream actual &&
 878
 879         test_create_repo upstream &&
 880         test_commit -C upstream foo &&
 881
 882         git clone upstream downstream &&
 883         git -C downstream checkout @{u} &&
 884         git -C downstream status >actual &&
 885         grep -E "HEAD detached at [0-9a-f]+" actual
 886 '
 887
 888 test_expect_success 'setup status submodule summary' '
 889         test_create_repo sm && (
 890                 cd sm &&
 891                 >foo &&
 892                 git add foo &&
 893                 git commit -m "Add foo"
 894         ) &&
 895         git add sm
 896 '
 897
 898 test_expect_success 'status submodule summary is disabled by default' '
 899         cat >expect <<EOF &&
 900 On branch main
 901 Your branch and '\''upstream'\'' have diverged,
 902 and have 1 and 2 different commits each, respectively.
 903   (use "git pull" if you want to integrate the remote branch with yours)
 904
 905 Changes to be committed:
 906   (use "git restore --staged <file>..." to unstage)
 907         new file:   dir2/added
 908         new file:   sm
 909
 910 Changes not staged for commit:
 911   (use "git add <file>..." to update what will be committed)
 912   (use "git restore <file>..." to discard changes in working directory)
 913         modified:   dir1/modified
 914
 915 Untracked files:
 916   (use "git add <file>..." to include in what will be committed)
 917         dir1/untracked
 918         dir2/modified
 919         dir2/untracked
 920         untracked
 921
 922 EOF
 923         git status >output &&
 924         test_cmp expect output
 925 '
 926
 927 # we expect the same as the previous test
 928 test_expect_success 'status --untracked-files=all does not show submodule' '
 929         git status --untracked-files=all >output &&
 930         test_cmp expect output
 931 '
 932
 933 cat >expect <<EOF
 934  M dir1/modified
 935 A  dir2/added
 936 A  sm
 937 ?? dir1/untracked
 938 ?? dir2/modified
 939 ?? dir2/untracked
 940 ?? untracked
 941 EOF
 942 test_expect_success 'status -s submodule summary is disabled by default' '
 943         git status -s >output &&
 944         test_cmp expect output
 945 '
 946
 947 # we expect the same as the previous test
 948 test_expect_success 'status -s --untracked-files=all does not show submodule' '
 949         git status -s --untracked-files=all >output &&
 950         test_cmp expect output
 951 '
 952
 953 head=$(cd sm && git rev-parse --short=7 --verify HEAD)
 954
 955 test_expect_success 'status submodule summary' '
 956         cat >expect <<EOF &&
 957 On branch main
 958 Your branch and '\''upstream'\'' have diverged,
 959 and have 1 and 2 different commits each, respectively.
 960   (use "git pull" if you want to integrate the remote branch with yours)
 961
 962 Changes to be committed:
 963   (use "git restore --staged <file>..." to unstage)
 964         new file:   dir2/added
 965         new file:   sm
 966
 967 Changes not staged for commit:
 968   (use "git add <file>..." to update what will be committed)
 969   (use "git restore <file>..." to discard changes in working directory)
 970         modified:   dir1/modified
 971
 972 Submodule changes to be committed:
 973
 974 * sm 0000000...$head (1):
 975   > Add foo
 976
 977 Untracked files:
 978   (use "git add <file>..." to include in what will be committed)
 979         dir1/untracked
 980         dir2/modified
 981         dir2/untracked
 982         untracked
 983
 984 EOF
 985         git config status.submodulesummary 10 &&
 986         git status >output &&
 987         test_cmp expect output
 988 '
 989
 990 test_expect_success 'status submodule summary with status.displayCommentPrefix=false' '
 991         strip_comments expect &&
 992         git -c status.displayCommentPrefix=false status >output &&
 993         test_cmp expect output
 994 '
 995
 996 test_expect_success 'commit with submodule summary ignores status.displayCommentPrefix' '
 997         commit_template_commented
 998 '
 999
1000 cat >expect <<EOF
1001  M dir1/modified
1002 A  dir2/added
1003 A  sm
1004 ?? dir1/untracked
1005 ?? dir2/modified
1006 ?? dir2/untracked
1007 ?? untracked
1008 EOF
1009 test_expect_success 'status -s submodule summary' '
1010         git status -s >output &&
1011         test_cmp expect output
1012 '
1013
1014 test_expect_success 'status submodule summary (clean submodule): commit' '
1015         cat >expect-status <<EOF &&
1016 On branch main
1017 Your branch and '\''upstream'\'' have diverged,
1018 and have 2 and 2 different commits each, respectively.
1019   (use "git pull" if you want to integrate the remote branch with yours)
1020
1021 Changes not staged for commit:
1022   (use "git add <file>..." to update what will be committed)
1023   (use "git restore <file>..." to discard changes in working directory)
1024         modified:   dir1/modified
1025
1026 Untracked files:
1027   (use "git add <file>..." to include in what will be committed)
1028         dir1/untracked
1029         dir2/modified
1030         dir2/untracked
1031         untracked
1032
1033 no changes added to commit (use "git add" and/or "git commit -a")
1034 EOF
1035         sed "/git pull/d" expect-status > expect-commit &&
1036         git commit -m "commit submodule" &&
1037         git config status.submodulesummary 10 &&
1038         test_must_fail git commit --dry-run >output &&
1039         test_cmp expect-commit output &&
1040         git status >output &&
1041         test_cmp expect-status output
1042 '
1043
1044 cat >expect <<EOF
1045  M dir1/modified
1046 ?? dir1/untracked
1047 ?? dir2/modified
1048 ?? dir2/untracked
1049 ?? untracked
1050 EOF
1051 test_expect_success 'status -s submodule summary (clean submodule)' '
1052         git status -s >output &&
1053         test_cmp expect output
1054 '
1055
1056 test_expect_success 'status -z implies porcelain' '
1057         git status --porcelain |
1058         perl -pe "s/\012/\000/g" >expect &&
1059         git status -z >output &&
1060         test_cmp expect output
1061 '
1062
1063 test_expect_success 'commit --dry-run submodule summary (--amend)' '
1064         cat >expect <<EOF &&
1065 On branch main
1066 Your branch and '\''upstream'\'' have diverged,
1067 and have 2 and 2 different commits each, respectively.
1068
1069 Changes to be committed:
1070   (use "git restore --source=HEAD^1 --staged <file>..." to unstage)
1071         new file:   dir2/added
1072         new file:   sm
1073
1074 Changes not staged for commit:
1075   (use "git add <file>..." to update what will be committed)
1076   (use "git restore <file>..." to discard changes in working directory)
1077         modified:   dir1/modified
1078
1079 Submodule changes to be committed:
1080
1081 * sm 0000000...$head (1):
1082   > Add foo
1083
1084 Untracked files:
1085   (use "git add <file>..." to include in what will be committed)
1086         dir1/untracked
1087         dir2/modified
1088         dir2/untracked
1089         untracked
1090
1091 EOF
1092         git config status.submodulesummary 10 &&
1093         git commit --dry-run --amend >output &&
1094         test_cmp expect output
1095 '
1096
1097 test_expect_success POSIXPERM,SANITY 'status succeeds in a read-only repository' '
1098         test_when_finished "chmod 775 .git" &&
1099         (
1100                 chmod a-w .git &&
1101                 # make dir1/tracked stat-dirty
1102                 >dir1/tracked1 && mv -f dir1/tracked1 dir1/tracked &&
1103                 git status -s >output &&
1104                 ! grep dir1/tracked output &&
1105                 # make sure "status" succeeded without writing index out
1106                 git diff-files | grep dir1/tracked
1107         )
1108 '
1109
1110 (cd sm && echo > bar && git add bar && git commit -q -m 'Add bar') && git add sm
1111 new_head=$(cd sm && git rev-parse --short=7 --verify HEAD)
1112 touch .gitmodules
1113
1114 test_expect_success '--ignore-submodules=untracked suppresses submodules with untracked content' '
1115         cat > expect << EOF &&
1116 On branch main
1117 Your branch and '\''upstream'\'' have diverged,
1118 and have 2 and 2 different commits each, respectively.
1119   (use "git pull" if you want to integrate the remote branch with yours)
1120
1121 Changes to be committed:
1122   (use "git restore --staged <file>..." to unstage)
1123         modified:   sm
1124
1125 Changes not staged for commit:
1126   (use "git add <file>..." to update what will be committed)
1127   (use "git restore <file>..." to discard changes in working directory)
1128         modified:   dir1/modified
1129
1130 Submodule changes to be committed:
1131
1132 * sm $head...$new_head (1):
1133   > Add bar
1134
1135 Untracked files:
1136   (use "git add <file>..." to include in what will be committed)
1137         .gitmodules
1138         dir1/untracked
1139         dir2/modified
1140         dir2/untracked
1141         untracked
1142
1143 EOF
1144         echo modified  sm/untracked &&
1145         git status --ignore-submodules=untracked >output &&
1146         test_cmp expect output
1147 '
1148
1149 test_expect_success '.gitmodules ignore=untracked suppresses submodules with untracked content' '
1150         test_config diff.ignoreSubmodules dirty &&
1151         git status >output &&
1152         test_cmp expect output &&
1153         git config --add -f .gitmodules submodule.subname.ignore untracked &&
1154         git config --add -f .gitmodules submodule.subname.path sm &&
1155         git status >output &&
1156         test_cmp expect output &&
1157         git config -f .gitmodules  --remove-section submodule.subname
1158 '
1159
1160 test_expect_success '.git/config ignore=untracked suppresses submodules with untracked content' '
1161         git config --add -f .gitmodules submodule.subname.ignore none &&
1162         git config --add -f .gitmodules submodule.subname.path sm &&
1163         git config --add submodule.subname.ignore untracked &&
1164         git config --add submodule.subname.path sm &&
1165         git status >output &&
1166         test_cmp expect output &&
1167         git config --remove-section submodule.subname &&
1168         git config --remove-section -f .gitmodules submodule.subname
1169 '
1170
1171 test_expect_success '--ignore-submodules=dirty suppresses submodules with untracked content' '
1172         git status --ignore-submodules=dirty >output &&
1173         test_cmp expect output
1174 '
1175
1176 test_expect_success '.gitmodules ignore=dirty suppresses submodules with untracked content' '
1177         test_config diff.ignoreSubmodules dirty &&
1178         git status >output &&
1179         ! test -s actual &&
1180         git config --add -f .gitmodules submodule.subname.ignore dirty &&
1181         git config --add -f .gitmodules submodule.subname.path sm &&
1182         git status >output &&
1183         test_cmp expect output &&
1184         git config -f .gitmodules  --remove-section submodule.subname
1185 '
1186
1187 test_expect_success '.git/config ignore=dirty suppresses submodules with untracked content' '
1188         git config --add -f .gitmodules submodule.subname.ignore none &&
1189         git config --add -f .gitmodules submodule.subname.path sm &&
1190         git config --add submodule.subname.ignore dirty &&
1191         git config --add submodule.subname.path sm &&
1192         git status >output &&
1193         test_cmp expect output &&
1194         git config --remove-section submodule.subname &&
1195         git config -f .gitmodules  --remove-section submodule.subname
1196 '
1197
1198 test_expect_success '--ignore-submodules=dirty suppresses submodules with modified content' '
1199         echo modified >sm/foo &&
1200         git status --ignore-submodules=dirty >output &&
1201         test_cmp expect output
1202 '
1203
1204 test_expect_success '.gitmodules ignore=dirty suppresses submodules with modified content' '
1205         git config --add -f .gitmodules submodule.subname.ignore dirty &&
1206         git config --add -f .gitmodules submodule.subname.path sm &&
1207         git status >output &&
1208         test_cmp expect output &&
1209         git config -f .gitmodules  --remove-section submodule.subname
1210 '
1211
1212 test_expect_success '.git/config ignore=dirty suppresses submodules with modified content' '
1213         git config --add -f .gitmodules submodule.subname.ignore none &&
1214         git config --add -f .gitmodules submodule.subname.path sm &&
1215         git config --add submodule.subname.ignore dirty &&
1216         git config --add submodule.subname.path sm &&
1217         git status >output &&
1218         test_cmp expect output &&
1219         git config --remove-section submodule.subname &&
1220         git config -f .gitmodules  --remove-section submodule.subname
1221 '
1222
1223 test_expect_success "--ignore-submodules=untracked doesn't suppress submodules with modified content" '
1224         cat > expect << EOF &&
1225 On branch main
1226 Your branch and '\''upstream'\'' have diverged,
1227 and have 2 and 2 different commits each, respectively.
1228   (use "git pull" if you want to integrate the remote branch with yours)
1229
1230 Changes to be committed:
1231   (use "git restore --staged <file>..." to unstage)
1232         modified:   sm
1233
1234 Changes not staged for commit:
1235   (use "git add <file>..." to update what will be committed)
1236   (use "git restore <file>..." to discard changes in working directory)
1237   (commit or discard the untracked or modified content in submodules)
1238         modified:   dir1/modified
1239         modified:   sm (modified content)
1240
1241 Submodule changes to be committed:
1242
1243 * sm $head...$new_head (1):
1244   > Add bar
1245
1246 Untracked files:
1247   (use "git add <file>..." to include in what will be committed)
1248         .gitmodules
1249         dir1/untracked
1250         dir2/modified
1251         dir2/untracked
1252         untracked
1253
1254 EOF
1255         git status --ignore-submodules=untracked > output &&
1256         test_cmp expect output
1257 '
1258
1259 test_expect_success ".gitmodules ignore=untracked doesn't suppress submodules with modified content" '
1260         git config --add -f .gitmodules submodule.subname.ignore untracked &&
1261         git config --add -f .gitmodules submodule.subname.path sm &&
1262         git status >output &&
1263         test_cmp expect output &&
1264         git config -f .gitmodules  --remove-section submodule.subname
1265 '
1266
1267 test_expect_success ".git/config ignore=untracked doesn't suppress submodules with modified content" '
1268         git config --add -f .gitmodules submodule.subname.ignore none &&
1269         git config --add -f .gitmodules submodule.subname.path sm &&
1270         git config --add submodule.subname.ignore untracked &&
1271         git config --add submodule.subname.path sm &&
1272         git status >output &&
1273         test_cmp expect output &&
1274         git config --remove-section submodule.subname &&
1275         git config -f .gitmodules  --remove-section submodule.subname
1276 '
1277
1278 head2=$(cd sm && git commit -q -m "2nd commit" foo && git rev-parse --short=7 --verify HEAD)
1279
1280 test_expect_success "--ignore-submodules=untracked doesn't suppress submodule summary" '
1281         cat > expect << EOF &&
1282 On branch main
1283 Your branch and '\''upstream'\'' have diverged,
1284 and have 2 and 2 different commits each, respectively.
1285   (use "git pull" if you want to integrate the remote branch with yours)
1286
1287 Changes to be committed:
1288   (use "git restore --staged <file>..." to unstage)
1289         modified:   sm
1290
1291 Changes not staged for commit:
1292   (use "git add <file>..." to update what will be committed)
1293   (use "git restore <file>..." to discard changes in working directory)
1294         modified:   dir1/modified
1295         modified:   sm (new commits)
1296
1297 Submodule changes to be committed:
1298
1299 * sm $head...$new_head (1):
1300   > Add bar
1301
1302 Submodules changed but not updated:
1303
1304 * sm $new_head...$head2 (1):
1305   > 2nd commit
1306
1307 Untracked files:
1308   (use "git add <file>..." to include in what will be committed)
1309         .gitmodules
1310         dir1/untracked
1311         dir2/modified
1312         dir2/untracked
1313         untracked
1314
1315 EOF
1316         git status --ignore-submodules=untracked > output &&
1317         test_cmp expect output
1318 '
1319
1320 test_expect_success ".gitmodules ignore=untracked doesn't suppress submodule summary" '
1321         git config --add -f .gitmodules submodule.subname.ignore untracked &&
1322         git config --add -f .gitmodules submodule.subname.path sm &&
1323         git status >output &&
1324         test_cmp expect output &&
1325         git config -f .gitmodules  --remove-section submodule.subname
1326 '
1327
1328 test_expect_success ".git/config ignore=untracked doesn't suppress submodule summary" '
1329         git config --add -f .gitmodules submodule.subname.ignore none &&
1330         git config --add -f .gitmodules submodule.subname.path sm &&
1331         git config --add submodule.subname.ignore untracked &&
1332         git config --add submodule.subname.path sm &&
1333         git status >output &&
1334         test_cmp expect output &&
1335         git config --remove-section submodule.subname &&
1336         git config -f .gitmodules  --remove-section submodule.subname
1337 '
1338
1339 test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summary" '
1340         git status --ignore-submodules=dirty > output &&
1341         test_cmp expect output
1342 '
1343 test_expect_success ".gitmodules ignore=dirty doesn't suppress submodule summary" '
1344         git config --add -f .gitmodules submodule.subname.ignore dirty &&
1345         git config --add -f .gitmodules submodule.subname.path sm &&
1346         git status >output &&
1347         test_cmp expect output &&
1348         git config -f .gitmodules  --remove-section submodule.subname
1349 '
1350
1351 test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary" '
1352         git config --add -f .gitmodules submodule.subname.ignore none &&
1353         git config --add -f .gitmodules submodule.subname.path sm &&
1354         git config --add submodule.subname.ignore dirty &&
1355         git config --add submodule.subname.path sm &&
1356         git status >output &&
1357         test_cmp expect output &&
1358         git config --remove-section submodule.subname &&
1359         git config -f .gitmodules  --remove-section submodule.subname
1360 '
1361
1362 cat > expect << EOF
1363 ; On branch main
1364 ; Your branch and 'upstream' have diverged,
1365 ; and have 2 and 2 different commits each, respectively.
1366 ;   (use "git pull" if you want to integrate the remote branch with yours)
1367 ;
1368 ; Changes to be committed:
1369 ;   (use "git restore --staged <file>..." to unstage)
1370 ;       modified:   sm
1371 ;
1372 ; Changes not staged for commit:
1373 ;   (use "git add <file>..." to update what will be committed)
1374 ;   (use "git restore <file>..." to discard changes in working directory)
1375 ;       modified:   dir1/modified
1376 ;       modified:   sm (new commits)
1377 ;
1378 ; Submodule changes to be committed:
1379 ;
1380 ; * sm $head...$new_head (1):
1381 ;   > Add bar
1382 ;
1383 ; Submodules changed but not updated:
1384 ;
1385 ; * sm $new_head...$head2 (1):
1386 ;   > 2nd commit
1387 ;
1388 ; Untracked files:
1389 ;   (use "git add <file>..." to include in what will be committed)
1390 ;       .gitmodules
1391 ;       dir1/untracked
1392 ;       dir2/modified
1393 ;       dir2/untracked
1394 ;       untracked
1395 ;
1396 EOF
1397
1398 test_expect_success "status (core.commentchar with submodule summary)" '
1399         test_config core.commentchar ";" &&
1400         git -c status.displayCommentPrefix=true status >output &&
1401         test_cmp expect output
1402 '
1403
1404 test_expect_success "status (core.commentchar with two chars with submodule summary)" '
1405         test_config core.commentchar ";;" &&
1406         test_must_fail git -c status.displayCommentPrefix=true status
1407 '
1408
1409 test_expect_success "--ignore-submodules=all suppresses submodule summary" '
1410         cat > expect << EOF &&
1411 On branch main
1412 Your branch and '\''upstream'\'' have diverged,
1413 and have 2 and 2 different commits each, respectively.
1414   (use "git pull" if you want to integrate the remote branch with yours)
1415
1416 Changes not staged for commit:
1417   (use "git add <file>..." to update what will be committed)
1418   (use "git restore <file>..." to discard changes in working directory)
1419         modified:   dir1/modified
1420
1421 Untracked files:
1422   (use "git add <file>..." to include in what will be committed)
1423         .gitmodules
1424         dir1/untracked
1425         dir2/modified
1426         dir2/untracked
1427         untracked
1428
1429 no changes added to commit (use "git add" and/or "git commit -a")
1430 EOF
1431         git status --ignore-submodules=all > output &&
1432         test_cmp expect output
1433 '
1434
1435 test_expect_success '.gitmodules ignore=all suppresses unstaged submodule summary' '
1436         cat > expect << EOF &&
1437 On branch main
1438 Your branch and '\''upstream'\'' have diverged,
1439 and have 2 and 2 different commits each, respectively.
1440   (use "git pull" if you want to integrate the remote branch with yours)
1441
1442 Changes to be committed:
1443   (use "git restore --staged <file>..." to unstage)
1444         modified:   sm
1445
1446 Changes not staged for commit:
1447   (use "git add <file>..." to update what will be committed)
1448   (use "git restore <file>..." to discard changes in working directory)
1449         modified:   dir1/modified
1450
1451 Untracked files:
1452   (use "git add <file>..." to include in what will be committed)
1453         .gitmodules
1454         dir1/untracked
1455         dir2/modified
1456         dir2/untracked
1457         untracked
1458
1459 EOF
1460         git config --add -f .gitmodules submodule.subname.ignore all &&
1461         git config --add -f .gitmodules submodule.subname.path sm &&
1462         git status > output &&
1463         test_cmp expect output &&
1464         git config -f .gitmodules  --remove-section submodule.subname
1465 '
1466
1467 test_expect_success '.git/config ignore=all suppresses unstaged submodule summary' '
1468         git config --add -f .gitmodules submodule.subname.ignore none &&
1469         git config --add -f .gitmodules submodule.subname.path sm &&
1470         git config --add submodule.subname.ignore all &&
1471         git config --add submodule.subname.path sm &&
1472         git status > output &&
1473         test_cmp expect output &&
1474         git config --remove-section submodule.subname &&
1475         git config -f .gitmodules  --remove-section submodule.subname
1476 '
1477
1478 test_expect_success 'setup of test environment' '
1479         git config status.showUntrackedFiles no &&
1480         git status -s >expected_short &&
1481         git status --no-short >expected_noshort
1482 '
1483
1484 test_expect_success '"status.short=true" same as "-s"' '
1485         git -c status.short=true status >actual &&
1486         test_cmp expected_short actual
1487 '
1488
1489 test_expect_success '"status.short=true" weaker than "--no-short"' '
1490         git -c status.short=true status --no-short >actual &&
1491         test_cmp expected_noshort actual
1492 '
1493
1494 test_expect_success '"status.short=false" same as "--no-short"' '
1495         git -c status.short=false status >actual &&
1496         test_cmp expected_noshort actual
1497 '
1498
1499 test_expect_success '"status.short=false" weaker than "-s"' '
1500         git -c status.short=false status -s >actual &&
1501         test_cmp expected_short actual
1502 '
1503
1504 test_expect_success '"status.branch=true" same as "-b"' '
1505         git status -sb >expected_branch &&
1506         git -c status.branch=true status -s >actual &&
1507         test_cmp expected_branch actual
1508 '
1509
1510 test_expect_success '"status.branch=true" different from "--no-branch"' '
1511         git status -s --no-branch  >expected_nobranch &&
1512         git -c status.branch=true status -s >actual &&
1513         ! test_cmp expected_nobranch actual
1514 '
1515
1516 test_expect_success '"status.branch=true" weaker than "--no-branch"' '
1517         git -c status.branch=true status -s --no-branch >actual &&
1518         test_cmp expected_nobranch actual
1519 '
1520
1521 test_expect_success '"status.branch=true" weaker than "--porcelain"' '
1522         git -c status.branch=true status --porcelain >actual &&
1523         test_cmp expected_nobranch actual
1524 '
1525
1526 test_expect_success '"status.branch=false" same as "--no-branch"' '
1527         git -c status.branch=false status -s >actual &&
1528         test_cmp expected_nobranch actual
1529 '
1530
1531 test_expect_success '"status.branch=false" weaker than "-b"' '
1532         git -c status.branch=false status -sb >actual &&
1533         test_cmp expected_branch actual
1534 '
1535
1536 test_expect_success 'Restore default test environment' '
1537         git config --unset status.showUntrackedFiles
1538 '
1539
1540 test_expect_success 'git commit will commit a staged but ignored submodule' '
1541         git config --add -f .gitmodules submodule.subname.ignore all &&
1542         git config --add -f .gitmodules submodule.subname.path sm &&
1543         git config --add submodule.subname.ignore all &&
1544         git status -s --ignore-submodules=dirty >output &&
1545         test_i18ngrep "^M. sm" output &&
1546         GIT_EDITOR="echo hello >>\"\$1\"" &&
1547         export GIT_EDITOR &&
1548         git commit -uno &&
1549         git status -s --ignore-submodules=dirty >output &&
1550         test_i18ngrep ! "^M. sm" output
1551 '
1552
1553 test_expect_success 'git commit --dry-run will show a staged but ignored submodule' '
1554         git reset HEAD^ &&
1555         git add sm &&
1556         cat >expect << EOF &&
1557 On branch main
1558 Your branch and '\''upstream'\'' have diverged,
1559 and have 2 and 2 different commits each, respectively.
1560
1561 Changes to be committed:
1562   (use "git restore --staged <file>..." to unstage)
1563         modified:   sm
1564
1565 Changes not staged for commit:
1566   (use "git add <file>..." to update what will be committed)
1567   (use "git restore <file>..." to discard changes in working directory)
1568         modified:   dir1/modified
1569
1570 Untracked files not listed (use -u option to show untracked files)
1571 EOF
1572         git commit -uno --dry-run >output &&
1573         test_cmp expect output &&
1574         git status -s --ignore-submodules=dirty >output &&
1575         test_i18ngrep "^M. sm" output
1576 '
1577
1578 test_expect_success 'git commit -m will commit a staged but ignored submodule' '
1579         git commit -uno -m message &&
1580         git status -s --ignore-submodules=dirty >output &&
1581         test_i18ngrep ! "^M. sm" output &&
1582         git config --remove-section submodule.subname &&
1583         git config -f .gitmodules  --remove-section submodule.subname
1584 '
1585
1586 test_expect_success 'show stash info with "--show-stash"' '
1587         git reset --hard &&
1588         git stash clear &&
1589         echo 1 >file &&
1590         git add file &&
1591         git stash &&
1592         git status >expected_default &&
1593         git status --show-stash >expected_with_stash &&
1594         test_i18ngrep "^Your stash currently has 1 entry$" expected_with_stash
1595 '
1596
1597 test_expect_success 'no stash info with "--show-stash --no-show-stash"' '
1598         git status --show-stash --no-show-stash >expected_without_stash &&
1599         test_cmp expected_default expected_without_stash
1600 '
1601
1602 test_expect_success '"status.showStash=false" weaker than "--show-stash"' '
1603         git -c status.showStash=false status --show-stash >actual &&
1604         test_cmp expected_with_stash actual
1605 '
1606
1607 test_expect_success '"status.showStash=true" weaker than "--no-show-stash"' '
1608         git -c status.showStash=true status --no-show-stash >actual &&
1609         test_cmp expected_without_stash actual
1610 '
1611
1612 test_expect_success 'no additional info if no stash entries' '
1613         git stash clear &&
1614         git -c status.showStash=true status >actual &&
1615         test_cmp expected_without_stash actual
1616 '
1617
1618 test_expect_success '"No commits yet" should be noted in status output' '
1619         git checkout --orphan empty-branch-1 &&
1620         git status >output &&
1621         test_i18ngrep "No commits yet" output
1622 '
1623
1624 test_expect_success '"No commits yet" should not be noted in status output' '
1625         git checkout --orphan empty-branch-2 &&
1626         test_commit test-commit-1 &&
1627         git status >output &&
1628         test_i18ngrep ! "No commits yet" output
1629 '
1630
1631 test_expect_success '"Initial commit" should be noted in commit template' '
1632         git checkout --orphan empty-branch-3 &&
1633         touch to_be_committed_1 &&
1634         git add to_be_committed_1 &&
1635         git commit --dry-run >output &&
1636         test_i18ngrep "Initial commit" output
1637 '
1638
1639 test_expect_success '"Initial commit" should not be noted in commit template' '
1640         git checkout --orphan empty-branch-4 &&
1641         test_commit test-commit-2 &&
1642         touch to_be_committed_2 &&
1643         git add to_be_committed_2 &&
1644         git commit --dry-run >output &&
1645         test_i18ngrep ! "Initial commit" output
1646 '
1647
1648 test_expect_success '--no-optional-locks prevents index update' '
1649         test_set_magic_mtime .git/index &&
1650         git --no-optional-locks status &&
1651         test_is_magic_mtime .git/index &&
1652         git status &&
1653         ! test_is_magic_mtime .git/index
1654 '
1655
1656 test_expect_success 'racy timestamps will be fixed for clean worktree' '
1657         echo content >racy-dirty &&
1658         echo content >racy-racy &&
1659         git add racy* &&
1660         git commit -m "racy test files" &&
1661         # let status rewrite the index, if necessary; after that we expect
1662         # no more index writes unless caused by racy timestamps; note that
1663         # timestamps may already be racy now (depending on previous tests)
1664         git status &&
1665         test_set_magic_mtime .git/index &&
1666         git status &&
1667         ! test_is_magic_mtime .git/index
1668 '
1669
1670 test_expect_success 'racy timestamps will be fixed for dirty worktree' '
1671         echo content2 >racy-dirty &&
1672         git status &&
1673         test_set_magic_mtime .git/index &&
1674         git status &&
1675         ! test_is_magic_mtime .git/index
1676 '
1677
1678 test_expect_success 'setup slow status advice' '
1679         GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main git init slowstatus &&
1680         (
1681                 cd slowstatus &&
1682                 cat >.gitignore <<-\EOF &&
1683                 /actual
1684                 /expected
1685                 /out
1686                 EOF
1687                 git add .gitignore &&
1688                 git commit -m "Add .gitignore" &&
1689                 git config advice.statusuoption true
1690         )
1691 '
1692
1693 test_expect_success 'slow status advice when core.untrackedCache and fsmonitor are unset' '
1694         (
1695                 cd slowstatus &&
1696                 git config core.untrackedCache false &&
1697                 git config core.fsmonitor false &&
1698                 GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
1699                 cat >expected <<-\EOF &&
1700                 On branch main
1701
1702                 It took 3.25 seconds to enumerate untracked files.
1703                 See '\''git help status'\'' for information on how to improve this.
1704
1705                 nothing to commit, working tree clean
1706                 EOF
1707                 test_cmp expected actual
1708         )
1709 '
1710
1711 test_expect_success 'slow status advice when core.untrackedCache true, but not fsmonitor' '
1712         (
1713                 cd slowstatus &&
1714                 git config core.untrackedCache true &&
1715                 git config core.fsmonitor false &&
1716                 GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
1717                 cat >expected <<-\EOF &&
1718                 On branch main
1719
1720                 It took 3.25 seconds to enumerate untracked files.
1721                 See '\''git help status'\'' for information on how to improve this.
1722
1723                 nothing to commit, working tree clean
1724                 EOF
1725                 test_cmp expected actual
1726         )
1727 '
1728
1729 test_expect_success 'slow status advice when core.untrackedCache true, and fsmonitor' '
1730         (
1731                 cd slowstatus &&
1732                 git config core.untrackedCache true &&
1733                 git config core.fsmonitor true &&
1734                 GIT_TEST_UF_DELAY_WARNING=1 git status >actual &&
1735                 cat >expected <<-\EOF &&
1736                 On branch main
1737
1738                 It took 3.25 seconds to enumerate untracked files,
1739                 but the results were cached, and subsequent runs may be faster.
1740                 See '\''git help status'\'' for information on how to improve this.
1741
1742                 nothing to commit, working tree clean
1743                 EOF
1744                 test_cmp expected actual
1745         )
1746 '
1747
1748 test_done