t/t7512-status-help.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2012 Valentin Duperray, Lucien Kong, Franck Jonas,
   4 #                    Thomas Nguy, Khoi Nguyen
   5 #                    Grenoble INP Ensimag
   6 #
   7
   8 test_description='git status advice'
   9
  10 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
  11 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
  12
  13 . ./test-lib.sh
  14
  15 . "$TEST_DIRECTORY"/lib-rebase.sh
  16
  17 set_fake_editor
  18
  19 test_expect_success 'prepare for conflicts' '
  20         git config --global advice.statusuoption false &&
  21         test_commit init main.txt init &&
  22         git branch conflicts &&
  23         test_commit on_main main.txt on_main &&
  24         git checkout conflicts &&
  25         test_commit on_conflicts main.txt on_conflicts
  26 '
  27
  28
  29 test_expect_success 'status when conflicts unresolved' '
  30         test_must_fail git merge main &&
  31         cat >expected <<\EOF &&
  32 On branch conflicts
  33 You have unmerged paths.
  34   (fix conflicts and run "git commit")
  35   (use "git merge --abort" to abort the merge)
  36
  37 Unmerged paths:
  38   (use "git add <file>..." to mark resolution)
  39         both modified:   main.txt
  40
  41 no changes added to commit (use "git add" and/or "git commit -a")
  42 EOF
  43         git status --untracked-files=no >actual &&
  44         test_cmp expected actual
  45 '
  46
  47
  48 test_expect_success 'status when conflicts resolved before commit' '
  49         git reset --hard conflicts &&
  50         test_must_fail git merge main &&
  51         echo one >main.txt &&
  52         git add main.txt &&
  53         cat >expected <<\EOF &&
  54 On branch conflicts
  55 All conflicts fixed but you are still merging.
  56   (use "git commit" to conclude merge)
  57
  58 Changes to be committed:
  59         modified:   main.txt
  60
  61 Untracked files not listed (use -u option to show untracked files)
  62 EOF
  63         git status --untracked-files=no >actual &&
  64         test_cmp expected actual
  65 '
  66
  67
  68 test_expect_success 'prepare for rebase conflicts' '
  69         git reset --hard main &&
  70         git checkout -b rebase_conflicts &&
  71         test_commit one_rebase main.txt one &&
  72         test_commit two_rebase main.txt two &&
  73         test_commit three_rebase main.txt three
  74 '
  75
  76
  77 test_expect_success 'status when rebase --apply in progress before resolving conflicts' '
  78         test_when_finished "git rebase --abort" &&
  79         ONTO=$(git rev-parse --short HEAD^^) &&
  80         test_must_fail git rebase --apply HEAD^ --onto HEAD^^ &&
  81         cat >expected <<EOF &&
  82 rebase in progress; onto $ONTO
  83 You are currently rebasing branch '\''rebase_conflicts'\'' on '\''$ONTO'\''.
  84   (fix conflicts and then run "git rebase --continue")
  85   (use "git rebase --skip" to skip this patch)
  86   (use "git rebase --abort" to check out the original branch)
  87
  88 Unmerged paths:
  89   (use "git restore --staged <file>..." to unstage)
  90   (use "git add <file>..." to mark resolution)
  91         both modified:   main.txt
  92
  93 no changes added to commit (use "git add" and/or "git commit -a")
  94 EOF
  95         git status --untracked-files=no >actual &&
  96         test_cmp expected actual
  97 '
  98
  99
 100 test_expect_success 'status when rebase --apply in progress before rebase --continue' '
 101         git reset --hard rebase_conflicts &&
 102         test_when_finished "git rebase --abort" &&
 103         ONTO=$(git rev-parse --short HEAD^^) &&
 104         test_must_fail git rebase --apply HEAD^ --onto HEAD^^ &&
 105         echo three >main.txt &&
 106         git add main.txt &&
 107         cat >expected <<EOF &&
 108 rebase in progress; onto $ONTO
 109 You are currently rebasing branch '\''rebase_conflicts'\'' on '\''$ONTO'\''.
 110   (all conflicts fixed: run "git rebase --continue")
 111
 112 Changes to be committed:
 113   (use "git restore --staged <file>..." to unstage)
 114         modified:   main.txt
 115
 116 Untracked files not listed (use -u option to show untracked files)
 117 EOF
 118         git status --untracked-files=no >actual &&
 119         test_cmp expected actual
 120 '
 121
 122
 123 test_expect_success 'prepare for rebase_i_conflicts' '
 124         git reset --hard main &&
 125         git checkout -b rebase_i_conflicts &&
 126         test_commit one_unmerge main.txt one_unmerge &&
 127         git branch rebase_i_conflicts_second &&
 128         test_commit one_main main.txt one_main &&
 129         git checkout rebase_i_conflicts_second &&
 130         test_commit one_second main.txt one_second
 131 '
 132
 133
 134 test_expect_success 'status during rebase -i when conflicts unresolved' '
 135         test_when_finished "git rebase --abort" &&
 136         ONTO=$(git rev-parse --short rebase_i_conflicts) &&
 137         LAST_COMMIT=$(git rev-parse --short rebase_i_conflicts_second) &&
 138         test_must_fail git rebase -i rebase_i_conflicts &&
 139         cat >expected <<EOF &&
 140 interactive rebase in progress; onto $ONTO
 141 Last command done (1 command done):
 142    pick $LAST_COMMIT one_second
 143 No commands remaining.
 144 You are currently rebasing branch '\''rebase_i_conflicts_second'\'' on '\''$ONTO'\''.
 145   (fix conflicts and then run "git rebase --continue")
 146   (use "git rebase --skip" to skip this patch)
 147   (use "git rebase --abort" to check out the original branch)
 148
 149 Unmerged paths:
 150   (use "git restore --staged <file>..." to unstage)
 151   (use "git add <file>..." to mark resolution)
 152         both modified:   main.txt
 153
 154 no changes added to commit (use "git add" and/or "git commit -a")
 155 EOF
 156         git status --untracked-files=no >actual &&
 157         test_cmp expected actual
 158 '
 159
 160
 161 test_expect_success 'status during rebase -i after resolving conflicts' '
 162         git reset --hard rebase_i_conflicts_second &&
 163         test_when_finished "git rebase --abort" &&
 164         ONTO=$(git rev-parse --short rebase_i_conflicts) &&
 165         LAST_COMMIT=$(git rev-parse --short rebase_i_conflicts_second) &&
 166         test_must_fail git rebase -i rebase_i_conflicts &&
 167         git add main.txt &&
 168         cat >expected <<EOF &&
 169 interactive rebase in progress; onto $ONTO
 170 Last command done (1 command done):
 171    pick $LAST_COMMIT one_second
 172 No commands remaining.
 173 You are currently rebasing branch '\''rebase_i_conflicts_second'\'' on '\''$ONTO'\''.
 174   (all conflicts fixed: run "git rebase --continue")
 175
 176 Changes to be committed:
 177   (use "git restore --staged <file>..." to unstage)
 178         modified:   main.txt
 179
 180 Untracked files not listed (use -u option to show untracked files)
 181 EOF
 182         git status --untracked-files=no >actual &&
 183         test_cmp expected actual
 184 '
 185
 186
 187 test_expect_success 'status when rebasing -i in edit mode' '
 188         git reset --hard main &&
 189         git checkout -b rebase_i_edit &&
 190         test_commit one_rebase_i main.txt one &&
 191         test_commit two_rebase_i main.txt two &&
 192         COMMIT2=$(git rev-parse --short rebase_i_edit) &&
 193         test_commit three_rebase_i main.txt three &&
 194         COMMIT3=$(git rev-parse --short rebase_i_edit) &&
 195         FAKE_LINES="1 edit 2" &&
 196         export FAKE_LINES &&
 197         test_when_finished "git rebase --abort" &&
 198         ONTO=$(git rev-parse --short HEAD~2) &&
 199         git rebase -i HEAD~2 &&
 200         cat >expected <<EOF &&
 201 interactive rebase in progress; onto $ONTO
 202 Last commands done (2 commands done):
 203    pick $COMMIT2 two_rebase_i
 204    edit $COMMIT3 three_rebase_i
 205 No commands remaining.
 206 You are currently editing a commit while rebasing branch '\''rebase_i_edit'\'' on '\''$ONTO'\''.
 207   (use "git commit --amend" to amend the current commit)
 208   (use "git rebase --continue" once you are satisfied with your changes)
 209
 210 nothing to commit (use -u to show untracked files)
 211 EOF
 212         git status --untracked-files=no >actual &&
 213         test_cmp expected actual
 214 '
 215
 216
 217 test_expect_success 'status when splitting a commit' '
 218         git reset --hard main &&
 219         git checkout -b split_commit &&
 220         test_commit one_split main.txt one &&
 221         test_commit two_split main.txt two &&
 222         COMMIT2=$(git rev-parse --short split_commit) &&
 223         test_commit three_split main.txt three &&
 224         COMMIT3=$(git rev-parse --short split_commit) &&
 225         test_commit four_split main.txt four &&
 226         COMMIT4=$(git rev-parse --short split_commit) &&
 227         FAKE_LINES="1 edit 2 3" &&
 228         export FAKE_LINES &&
 229         test_when_finished "git rebase --abort" &&
 230         ONTO=$(git rev-parse --short HEAD~3) &&
 231         git rebase -i HEAD~3 &&
 232         git reset HEAD^ &&
 233         cat >expected <<EOF &&
 234 interactive rebase in progress; onto $ONTO
 235 Last commands done (2 commands done):
 236    pick $COMMIT2 two_split
 237    edit $COMMIT3 three_split
 238 Next command to do (1 remaining command):
 239    pick $COMMIT4 four_split
 240   (use "git rebase --edit-todo" to view and edit)
 241 You are currently splitting a commit while rebasing branch '\''split_commit'\'' on '\''$ONTO'\''.
 242   (Once your working directory is clean, run "git rebase --continue")
 243
 244 Changes not staged for commit:
 245   (use "git add <file>..." to update what will be committed)
 246   (use "git restore <file>..." to discard changes in working directory)
 247         modified:   main.txt
 248
 249 no changes added to commit (use "git add" and/or "git commit -a")
 250 EOF
 251         git status --untracked-files=no >actual &&
 252         test_cmp expected actual
 253 '
 254
 255
 256 test_expect_success 'status after editing the last commit with --amend during a rebase -i' '
 257         git reset --hard main &&
 258         git checkout -b amend_last &&
 259         test_commit one_amend main.txt one &&
 260         test_commit two_amend main.txt two &&
 261         test_commit three_amend main.txt three &&
 262         COMMIT3=$(git rev-parse --short amend_last) &&
 263         test_commit four_amend main.txt four &&
 264         COMMIT4=$(git rev-parse --short amend_last) &&
 265         FAKE_LINES="1 2 edit 3" &&
 266         export FAKE_LINES &&
 267         test_when_finished "git rebase --abort" &&
 268         ONTO=$(git rev-parse --short HEAD~3) &&
 269         git rebase -i HEAD~3 &&
 270         git commit --amend -m "foo" &&
 271         cat >expected <<EOF &&
 272 interactive rebase in progress; onto $ONTO
 273 Last commands done (3 commands done):
 274    pick $COMMIT3 three_amend
 275    edit $COMMIT4 four_amend
 276   (see more in file .git/rebase-merge/done)
 277 No commands remaining.
 278 You are currently editing a commit while rebasing branch '\''amend_last'\'' on '\''$ONTO'\''.
 279   (use "git commit --amend" to amend the current commit)
 280   (use "git rebase --continue" once you are satisfied with your changes)
 281
 282 nothing to commit (use -u to show untracked files)
 283 EOF
 284         git status --untracked-files=no >actual &&
 285         test_cmp expected actual
 286 '
 287
 288
 289 test_expect_success 'prepare for several edits' '
 290         git reset --hard main &&
 291         git checkout -b several_edits &&
 292         test_commit one_edits main.txt one &&
 293         test_commit two_edits main.txt two &&
 294         test_commit three_edits main.txt three &&
 295         test_commit four_edits main.txt four
 296 '
 297
 298
 299 test_expect_success 'status: (continue first edit) second edit' '
 300         FAKE_LINES="edit 1 edit 2 3" &&
 301         export FAKE_LINES &&
 302         test_when_finished "git rebase --abort" &&
 303         COMMIT2=$(git rev-parse --short several_edits^^) &&
 304         COMMIT3=$(git rev-parse --short several_edits^) &&
 305         COMMIT4=$(git rev-parse --short several_edits) &&
 306         ONTO=$(git rev-parse --short HEAD~3) &&
 307         git rebase -i HEAD~3 &&
 308         git rebase --continue &&
 309         cat >expected <<EOF &&
 310 interactive rebase in progress; onto $ONTO
 311 Last commands done (2 commands done):
 312    edit $COMMIT2 two_edits
 313    edit $COMMIT3 three_edits
 314 Next command to do (1 remaining command):
 315    pick $COMMIT4 four_edits
 316   (use "git rebase --edit-todo" to view and edit)
 317 You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
 318   (use "git commit --amend" to amend the current commit)
 319   (use "git rebase --continue" once you are satisfied with your changes)
 320
 321 nothing to commit (use -u to show untracked files)
 322 EOF
 323         git status --untracked-files=no >actual &&
 324         test_cmp expected actual
 325 '
 326
 327
 328 test_expect_success 'status: (continue first edit) second edit and split' '
 329         git reset --hard several_edits &&
 330         FAKE_LINES="edit 1 edit 2 3" &&
 331         export FAKE_LINES &&
 332         test_when_finished "git rebase --abort" &&
 333         COMMIT2=$(git rev-parse --short several_edits^^) &&
 334         COMMIT3=$(git rev-parse --short several_edits^) &&
 335         COMMIT4=$(git rev-parse --short several_edits) &&
 336         ONTO=$(git rev-parse --short HEAD~3) &&
 337         git rebase -i HEAD~3 &&
 338         git rebase --continue &&
 339         git reset HEAD^ &&
 340         cat >expected <<EOF &&
 341 interactive rebase in progress; onto $ONTO
 342 Last commands done (2 commands done):
 343    edit $COMMIT2 two_edits
 344    edit $COMMIT3 three_edits
 345 Next command to do (1 remaining command):
 346    pick $COMMIT4 four_edits
 347   (use "git rebase --edit-todo" to view and edit)
 348 You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
 349   (Once your working directory is clean, run "git rebase --continue")
 350
 351 Changes not staged for commit:
 352   (use "git add <file>..." to update what will be committed)
 353   (use "git restore <file>..." to discard changes in working directory)
 354         modified:   main.txt
 355
 356 no changes added to commit (use "git add" and/or "git commit -a")
 357 EOF
 358         git status --untracked-files=no >actual &&
 359         test_cmp expected actual
 360 '
 361
 362
 363 test_expect_success 'status: (continue first edit) second edit and amend' '
 364         git reset --hard several_edits &&
 365         FAKE_LINES="edit 1 edit 2 3" &&
 366         export FAKE_LINES &&
 367         test_when_finished "git rebase --abort" &&
 368         COMMIT2=$(git rev-parse --short several_edits^^) &&
 369         COMMIT3=$(git rev-parse --short several_edits^) &&
 370         COMMIT4=$(git rev-parse --short several_edits) &&
 371         ONTO=$(git rev-parse --short HEAD~3) &&
 372         git rebase -i HEAD~3 &&
 373         git rebase --continue &&
 374         git commit --amend -m "foo" &&
 375         cat >expected <<EOF &&
 376 interactive rebase in progress; onto $ONTO
 377 Last commands done (2 commands done):
 378    edit $COMMIT2 two_edits
 379    edit $COMMIT3 three_edits
 380 Next command to do (1 remaining command):
 381    pick $COMMIT4 four_edits
 382   (use "git rebase --edit-todo" to view and edit)
 383 You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
 384   (use "git commit --amend" to amend the current commit)
 385   (use "git rebase --continue" once you are satisfied with your changes)
 386
 387 nothing to commit (use -u to show untracked files)
 388 EOF
 389         git status --untracked-files=no >actual &&
 390         test_cmp expected actual
 391 '
 392
 393
 394 test_expect_success 'status: (amend first edit) second edit' '
 395         git reset --hard several_edits &&
 396         FAKE_LINES="edit 1 edit 2 3" &&
 397         export FAKE_LINES &&
 398         test_when_finished "git rebase --abort" &&
 399         COMMIT2=$(git rev-parse --short several_edits^^) &&
 400         COMMIT3=$(git rev-parse --short several_edits^) &&
 401         COMMIT4=$(git rev-parse --short several_edits) &&
 402         ONTO=$(git rev-parse --short HEAD~3) &&
 403         git rebase -i HEAD~3 &&
 404         git commit --amend -m "a" &&
 405         git rebase --continue &&
 406         cat >expected <<EOF &&
 407 interactive rebase in progress; onto $ONTO
 408 Last commands done (2 commands done):
 409    edit $COMMIT2 two_edits
 410    edit $COMMIT3 three_edits
 411 Next command to do (1 remaining command):
 412    pick $COMMIT4 four_edits
 413   (use "git rebase --edit-todo" to view and edit)
 414 You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
 415   (use "git commit --amend" to amend the current commit)
 416   (use "git rebase --continue" once you are satisfied with your changes)
 417
 418 nothing to commit (use -u to show untracked files)
 419 EOF
 420         git status --untracked-files=no >actual &&
 421         test_cmp expected actual
 422 '
 423
 424
 425 test_expect_success 'status: (amend first edit) second edit and split' '
 426         git reset --hard several_edits &&
 427         FAKE_LINES="edit 1 edit 2 3" &&
 428         export FAKE_LINES &&
 429         test_when_finished "git rebase --abort" &&
 430         ONTO=$(git rev-parse --short HEAD~3) &&
 431         COMMIT2=$(git rev-parse --short several_edits^^) &&
 432         COMMIT3=$(git rev-parse --short several_edits^) &&
 433         COMMIT4=$(git rev-parse --short several_edits) &&
 434         git rebase -i HEAD~3 &&
 435         git commit --amend -m "b" &&
 436         git rebase --continue &&
 437         git reset HEAD^ &&
 438         cat >expected <<EOF &&
 439 interactive rebase in progress; onto $ONTO
 440 Last commands done (2 commands done):
 441    edit $COMMIT2 two_edits
 442    edit $COMMIT3 three_edits
 443 Next command to do (1 remaining command):
 444    pick $COMMIT4 four_edits
 445   (use "git rebase --edit-todo" to view and edit)
 446 You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
 447   (Once your working directory is clean, run "git rebase --continue")
 448
 449 Changes not staged for commit:
 450   (use "git add <file>..." to update what will be committed)
 451   (use "git restore <file>..." to discard changes in working directory)
 452         modified:   main.txt
 453
 454 no changes added to commit (use "git add" and/or "git commit -a")
 455 EOF
 456         git status --untracked-files=no >actual &&
 457         test_cmp expected actual
 458 '
 459
 460
 461 test_expect_success 'status: (amend first edit) second edit and amend' '
 462         git reset --hard several_edits &&
 463         FAKE_LINES="edit 1 edit 2 3" &&
 464         export FAKE_LINES &&
 465         test_when_finished "git rebase --abort" &&
 466         COMMIT2=$(git rev-parse --short several_edits^^) &&
 467         COMMIT3=$(git rev-parse --short several_edits^) &&
 468         COMMIT4=$(git rev-parse --short several_edits) &&
 469         ONTO=$(git rev-parse --short HEAD~3) &&
 470         git rebase -i HEAD~3 &&
 471         git commit --amend -m "c" &&
 472         git rebase --continue &&
 473         git commit --amend -m "d" &&
 474         cat >expected <<EOF &&
 475 interactive rebase in progress; onto $ONTO
 476 Last commands done (2 commands done):
 477    edit $COMMIT2 two_edits
 478    edit $COMMIT3 three_edits
 479 Next command to do (1 remaining command):
 480    pick $COMMIT4 four_edits
 481   (use "git rebase --edit-todo" to view and edit)
 482 You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
 483   (use "git commit --amend" to amend the current commit)
 484   (use "git rebase --continue" once you are satisfied with your changes)
 485
 486 nothing to commit (use -u to show untracked files)
 487 EOF
 488         git status --untracked-files=no >actual &&
 489         test_cmp expected actual
 490 '
 491
 492
 493 test_expect_success 'status: (split first edit) second edit' '
 494         git reset --hard several_edits &&
 495         FAKE_LINES="edit 1 edit 2 3" &&
 496         export FAKE_LINES &&
 497         test_when_finished "git rebase --abort" &&
 498         COMMIT2=$(git rev-parse --short several_edits^^) &&
 499         COMMIT3=$(git rev-parse --short several_edits^) &&
 500         COMMIT4=$(git rev-parse --short several_edits) &&
 501         ONTO=$(git rev-parse --short HEAD~3) &&
 502         git rebase -i HEAD~3 &&
 503         git reset HEAD^ &&
 504         git add main.txt &&
 505         git commit -m "e" &&
 506         git rebase --continue &&
 507         cat >expected <<EOF &&
 508 interactive rebase in progress; onto $ONTO
 509 Last commands done (2 commands done):
 510    edit $COMMIT2 two_edits
 511    edit $COMMIT3 three_edits
 512 Next command to do (1 remaining command):
 513    pick $COMMIT4 four_edits
 514   (use "git rebase --edit-todo" to view and edit)
 515 You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
 516   (use "git commit --amend" to amend the current commit)
 517   (use "git rebase --continue" once you are satisfied with your changes)
 518
 519 nothing to commit (use -u to show untracked files)
 520 EOF
 521         git status --untracked-files=no >actual &&
 522         test_cmp expected actual
 523 '
 524
 525
 526 test_expect_success 'status: (split first edit) second edit and split' '
 527         git reset --hard several_edits &&
 528         FAKE_LINES="edit 1 edit 2 3" &&
 529         export FAKE_LINES &&
 530         test_when_finished "git rebase --abort" &&
 531         COMMIT2=$(git rev-parse --short several_edits^^) &&
 532         COMMIT3=$(git rev-parse --short several_edits^) &&
 533         COMMIT4=$(git rev-parse --short several_edits) &&
 534         ONTO=$(git rev-parse --short HEAD~3) &&
 535         git rebase -i HEAD~3 &&
 536         git reset HEAD^ &&
 537         git add main.txt &&
 538         git commit --amend -m "f" &&
 539         git rebase --continue &&
 540         git reset HEAD^ &&
 541         cat >expected <<EOF &&
 542 interactive rebase in progress; onto $ONTO
 543 Last commands done (2 commands done):
 544    edit $COMMIT2 two_edits
 545    edit $COMMIT3 three_edits
 546 Next command to do (1 remaining command):
 547    pick $COMMIT4 four_edits
 548   (use "git rebase --edit-todo" to view and edit)
 549 You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
 550   (Once your working directory is clean, run "git rebase --continue")
 551
 552 Changes not staged for commit:
 553   (use "git add <file>..." to update what will be committed)
 554   (use "git restore <file>..." to discard changes in working directory)
 555         modified:   main.txt
 556
 557 no changes added to commit (use "git add" and/or "git commit -a")
 558 EOF
 559         git status --untracked-files=no >actual &&
 560         test_cmp expected actual
 561 '
 562
 563
 564 test_expect_success 'status: (split first edit) second edit and amend' '
 565         git reset --hard several_edits &&
 566         FAKE_LINES="edit 1 edit 2 3" &&
 567         export FAKE_LINES &&
 568         test_when_finished "git rebase --abort" &&
 569         COMMIT2=$(git rev-parse --short several_edits^^) &&
 570         COMMIT3=$(git rev-parse --short several_edits^) &&
 571         COMMIT4=$(git rev-parse --short several_edits) &&
 572         ONTO=$(git rev-parse --short HEAD~3) &&
 573         git rebase -i HEAD~3 &&
 574         git reset HEAD^ &&
 575         git add main.txt &&
 576         git commit --amend -m "g" &&
 577         git rebase --continue &&
 578         git commit --amend -m "h" &&
 579         cat >expected <<EOF &&
 580 interactive rebase in progress; onto $ONTO
 581 Last commands done (2 commands done):
 582    edit $COMMIT2 two_edits
 583    edit $COMMIT3 three_edits
 584 Next command to do (1 remaining command):
 585    pick $COMMIT4 four_edits
 586   (use "git rebase --edit-todo" to view and edit)
 587 You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''.
 588   (use "git commit --amend" to amend the current commit)
 589   (use "git rebase --continue" once you are satisfied with your changes)
 590
 591 nothing to commit (use -u to show untracked files)
 592 EOF
 593         git status --untracked-files=no >actual &&
 594         test_cmp expected actual
 595 '
 596
 597
 598 test_expect_success 'prepare am_session' '
 599         git reset --hard main &&
 600         git checkout -b am_session &&
 601         test_commit one_am one.txt "one" &&
 602         test_commit two_am two.txt "two" &&
 603         test_commit three_am three.txt "three"
 604 '
 605
 606
 607 test_expect_success 'status in an am session: file already exists' '
 608         git checkout -b am_already_exists &&
 609         test_when_finished "rm Maildir/* && git am --abort" &&
 610         git format-patch -1 -oMaildir &&
 611         test_must_fail git am Maildir/*.patch &&
 612         cat >expected <<\EOF &&
 613 On branch am_already_exists
 614 You are in the middle of an am session.
 615   (fix conflicts and then run "git am --continue")
 616   (use "git am --skip" to skip this patch)
 617   (use "git am --abort" to restore the original branch)
 618
 619 nothing to commit (use -u to show untracked files)
 620 EOF
 621         git status --untracked-files=no >actual &&
 622         test_cmp expected actual
 623 '
 624
 625
 626 test_expect_success 'status in an am session: file does not exist' '
 627         git reset --hard am_session &&
 628         git checkout -b am_not_exists &&
 629         git rm three.txt &&
 630         git commit -m "delete three.txt" &&
 631         test_when_finished "rm Maildir/* && git am --abort" &&
 632         git format-patch -1 -oMaildir &&
 633         test_must_fail git am Maildir/*.patch &&
 634         cat >expected <<\EOF &&
 635 On branch am_not_exists
 636 You are in the middle of an am session.
 637   (fix conflicts and then run "git am --continue")
 638   (use "git am --skip" to skip this patch)
 639   (use "git am --abort" to restore the original branch)
 640
 641 nothing to commit (use -u to show untracked files)
 642 EOF
 643         git status --untracked-files=no >actual &&
 644         test_cmp expected actual
 645 '
 646
 647
 648 test_expect_success 'status in an am session: empty patch' '
 649         git reset --hard am_session &&
 650         git checkout -b am_empty &&
 651         test_when_finished "rm Maildir/* && git am --abort" &&
 652         git format-patch -3 -oMaildir &&
 653         git rm one.txt two.txt three.txt &&
 654         git commit -m "delete all am_empty" &&
 655         echo error >Maildir/0002-two_am.patch &&
 656         test_must_fail git am Maildir/*.patch &&
 657         cat >expected <<\EOF &&
 658 On branch am_empty
 659 You are in the middle of an am session.
 660 The current patch is empty.
 661   (use "git am --skip" to skip this patch)
 662   (use "git am --allow-empty" to record this patch as an empty commit)
 663   (use "git am --abort" to restore the original branch)
 664
 665 nothing to commit (use -u to show untracked files)
 666 EOF
 667         git status --untracked-files=no >actual &&
 668         test_cmp expected actual
 669 '
 670
 671
 672 test_expect_success 'status when bisecting' '
 673         git reset --hard main &&
 674         git checkout -b bisect &&
 675         test_commit one_bisect main.txt one &&
 676         test_commit two_bisect main.txt two &&
 677         test_commit three_bisect main.txt three &&
 678         test_when_finished "git bisect reset" &&
 679         git bisect start &&
 680         git bisect bad &&
 681         git bisect good one_bisect &&
 682         TGT=$(git rev-parse --short two_bisect) &&
 683         cat >expected <<EOF &&
 684 HEAD detached at $TGT
 685 You are currently bisecting, started from branch '\''bisect'\''.
 686   (use "git bisect reset" to get back to the original branch)
 687
 688 nothing to commit (use -u to show untracked files)
 689 EOF
 690         git status --untracked-files=no >actual &&
 691         test_cmp expected actual
 692 '
 693
 694
 695 test_expect_success 'status when rebase --apply conflicts with statushints disabled' '
 696         git reset --hard main &&
 697         git checkout -b statushints_disabled &&
 698         test_when_finished "git config --local advice.statushints true" &&
 699         git config --local advice.statushints false &&
 700         test_commit one_statushints main.txt one &&
 701         test_commit two_statushints main.txt two &&
 702         test_commit three_statushints main.txt three &&
 703         test_when_finished "git rebase --abort" &&
 704         ONTO=$(git rev-parse --short HEAD^^) &&
 705         test_must_fail git rebase --apply HEAD^ --onto HEAD^^ &&
 706         cat >expected <<EOF &&
 707 rebase in progress; onto $ONTO
 708 You are currently rebasing branch '\''statushints_disabled'\'' on '\''$ONTO'\''.
 709
 710 Unmerged paths:
 711         both modified:   main.txt
 712
 713 no changes added to commit
 714 EOF
 715         git status --untracked-files=no >actual &&
 716         test_cmp expected actual
 717 '
 718
 719
 720 test_expect_success 'prepare for cherry-pick conflicts' '
 721         git reset --hard main &&
 722         git checkout -b cherry_branch &&
 723         test_commit one_cherry main.txt one &&
 724         test_commit two_cherries main.txt two &&
 725         git checkout -b cherry_branch_second &&
 726         test_commit second_cherry main.txt second &&
 727         git checkout cherry_branch &&
 728         test_commit three_cherries main.txt three
 729 '
 730
 731
 732 test_expect_success 'status when cherry-picking before resolving conflicts' '
 733         test_when_finished "git cherry-pick --abort" &&
 734         test_must_fail git cherry-pick cherry_branch_second &&
 735         TO_CHERRY_PICK=$(git rev-parse --short CHERRY_PICK_HEAD) &&
 736         cat >expected <<EOF &&
 737 On branch cherry_branch
 738 You are currently cherry-picking commit $TO_CHERRY_PICK.
 739   (fix conflicts and run "git cherry-pick --continue")
 740   (use "git cherry-pick --skip" to skip this patch)
 741   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 742
 743 Unmerged paths:
 744   (use "git add <file>..." to mark resolution)
 745         both modified:   main.txt
 746
 747 no changes added to commit (use "git add" and/or "git commit -a")
 748 EOF
 749         git status --untracked-files=no >actual &&
 750         test_cmp expected actual
 751 '
 752
 753
 754 test_expect_success 'status when cherry-picking after resolving conflicts' '
 755         git reset --hard cherry_branch &&
 756         test_when_finished "git cherry-pick --abort" &&
 757         test_must_fail git cherry-pick cherry_branch_second &&
 758         TO_CHERRY_PICK=$(git rev-parse --short CHERRY_PICK_HEAD) &&
 759         echo end >main.txt &&
 760         git add main.txt &&
 761         cat >expected <<EOF &&
 762 On branch cherry_branch
 763 You are currently cherry-picking commit $TO_CHERRY_PICK.
 764   (all conflicts fixed: run "git cherry-pick --continue")
 765   (use "git cherry-pick --skip" to skip this patch)
 766   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 767
 768 Changes to be committed:
 769         modified:   main.txt
 770
 771 Untracked files not listed (use -u option to show untracked files)
 772 EOF
 773         git status --untracked-files=no >actual &&
 774         test_cmp expected actual
 775 '
 776
 777 test_expect_success 'status when cherry-picking multiple commits' '
 778         git reset --hard cherry_branch &&
 779         test_when_finished "git cherry-pick --abort" &&
 780         test_must_fail git cherry-pick cherry_branch_second one_cherry &&
 781         TO_CHERRY_PICK=$(git rev-parse --short CHERRY_PICK_HEAD) &&
 782         cat >expected <<EOF &&
 783 On branch cherry_branch
 784 You are currently cherry-picking commit $TO_CHERRY_PICK.
 785   (fix conflicts and run "git cherry-pick --continue")
 786   (use "git cherry-pick --skip" to skip this patch)
 787   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 788
 789 Unmerged paths:
 790   (use "git add <file>..." to mark resolution)
 791         both modified:   main.txt
 792
 793 no changes added to commit (use "git add" and/or "git commit -a")
 794 EOF
 795         git status --untracked-files=no >actual &&
 796         test_cmp expected actual
 797 '
 798
 799 test_expect_success 'status when cherry-picking after committing conflict resolution' '
 800         git reset --hard cherry_branch &&
 801         test_when_finished "git cherry-pick --abort" &&
 802         test_must_fail git cherry-pick cherry_branch_second one_cherry &&
 803         echo end >main.txt &&
 804         git commit -a &&
 805         cat >expected <<EOF &&
 806 On branch cherry_branch
 807 Cherry-pick currently in progress.
 808   (run "git cherry-pick --continue" to continue)
 809   (use "git cherry-pick --skip" to skip this patch)
 810   (use "git cherry-pick --abort" to cancel the cherry-pick operation)
 811
 812 nothing to commit (use -u to show untracked files)
 813 EOF
 814         git status --untracked-files=no >actual &&
 815         test_cmp expected actual
 816 '
 817
 818 test_expect_success 'status shows cherry-pick with invalid oid' '
 819         mkdir .git/sequencer &&
 820         test_write_lines "pick invalid-oid" >.git/sequencer/todo &&
 821         git status --untracked-files=no >actual 2>err &&
 822         git cherry-pick --quit &&
 823         test_must_be_empty err &&
 824         test_cmp expected actual
 825 '
 826
 827 test_expect_success 'status does not show error if .git/sequencer is a file' '
 828         test_when_finished "rm .git/sequencer" &&
 829         test_write_lines hello >.git/sequencer &&
 830         git status --untracked-files=no 2>err &&
 831         test_must_be_empty err
 832 '
 833
 834 test_expect_success 'status showing detached at and from a tag' '
 835         test_commit atag tagging &&
 836         git checkout atag &&
 837         cat >expected <<\EOF &&
 838 HEAD detached at atag
 839 nothing to commit (use -u to show untracked files)
 840 EOF
 841         git status --untracked-files=no >actual &&
 842         test_cmp expected actual &&
 843
 844         git reset --hard HEAD^ &&
 845         cat >expected <<\EOF &&
 846 HEAD detached from atag
 847 nothing to commit (use -u to show untracked files)
 848 EOF
 849         git status --untracked-files=no >actual &&
 850         test_cmp expected actual
 851 '
 852
 853 test_expect_success 'status while reverting commit (conflicts)' '
 854         git checkout main &&
 855         echo before >to-revert.txt &&
 856         test_commit before to-revert.txt &&
 857         echo old >to-revert.txt &&
 858         test_commit old to-revert.txt &&
 859         echo new >to-revert.txt &&
 860         test_commit new to-revert.txt &&
 861         TO_REVERT=$(git rev-parse --short HEAD^) &&
 862         test_must_fail git revert $TO_REVERT &&
 863         cat >expected <<EOF &&
 864 On branch main
 865 You are currently reverting commit $TO_REVERT.
 866   (fix conflicts and run "git revert --continue")
 867   (use "git revert --skip" to skip this patch)
 868   (use "git revert --abort" to cancel the revert operation)
 869
 870 Unmerged paths:
 871   (use "git restore --staged <file>..." to unstage)
 872   (use "git add <file>..." to mark resolution)
 873         both modified:   to-revert.txt
 874
 875 no changes added to commit (use "git add" and/or "git commit -a")
 876 EOF
 877         git status --untracked-files=no >actual &&
 878         test_cmp expected actual
 879 '
 880
 881 test_expect_success 'status while reverting commit (conflicts resolved)' '
 882         echo reverted >to-revert.txt &&
 883         git add to-revert.txt &&
 884         cat >expected <<EOF &&
 885 On branch main
 886 You are currently reverting commit $TO_REVERT.
 887   (all conflicts fixed: run "git revert --continue")
 888   (use "git revert --skip" to skip this patch)
 889   (use "git revert --abort" to cancel the revert operation)
 890
 891 Changes to be committed:
 892   (use "git restore --staged <file>..." to unstage)
 893         modified:   to-revert.txt
 894
 895 Untracked files not listed (use -u option to show untracked files)
 896 EOF
 897         git status --untracked-files=no >actual &&
 898         test_cmp expected actual
 899 '
 900
 901 test_expect_success 'status after reverting commit' '
 902         git revert --continue &&
 903         cat >expected <<\EOF &&
 904 On branch main
 905 nothing to commit (use -u to show untracked files)
 906 EOF
 907         git status --untracked-files=no >actual &&
 908         test_cmp expected actual
 909 '
 910
 911 test_expect_success 'status while reverting after committing conflict resolution' '
 912         test_when_finished "git revert --abort" &&
 913         git reset --hard new &&
 914         test_must_fail git revert old new &&
 915         echo reverted >to-revert.txt &&
 916         git commit -a &&
 917         cat >expected <<EOF &&
 918 On branch main
 919 Revert currently in progress.
 920   (run "git revert --continue" to continue)
 921   (use "git revert --skip" to skip this patch)
 922   (use "git revert --abort" to cancel the revert operation)
 923
 924 nothing to commit (use -u to show untracked files)
 925 EOF
 926         git status --untracked-files=no >actual &&
 927         test_cmp expected actual
 928 '
 929
 930 test_expect_success 'prepare for different number of commits rebased' '
 931         git reset --hard main &&
 932         git checkout -b several_commits &&
 933         test_commit one_commit main.txt one &&
 934         test_commit two_commit main.txt two &&
 935         test_commit three_commit main.txt three &&
 936         test_commit four_commit main.txt four
 937 '
 938
 939 test_expect_success 'status: one command done nothing remaining' '
 940         FAKE_LINES="exec_exit_15" &&
 941         export FAKE_LINES &&
 942         test_when_finished "git rebase --abort" &&
 943         ONTO=$(git rev-parse --short HEAD~3) &&
 944         test_must_fail git rebase -i HEAD~3 &&
 945         cat >expected <<EOF &&
 946 interactive rebase in progress; onto $ONTO
 947 Last command done (1 command done):
 948    exec exit 15
 949 No commands remaining.
 950 You are currently editing a commit while rebasing branch '\''several_commits'\'' on '\''$ONTO'\''.
 951   (use "git commit --amend" to amend the current commit)
 952   (use "git rebase --continue" once you are satisfied with your changes)
 953
 954 nothing to commit (use -u to show untracked files)
 955 EOF
 956         git status --untracked-files=no >actual &&
 957         test_cmp expected actual
 958 '
 959
 960 test_expect_success 'status: two commands done with some white lines in done file' '
 961         FAKE_LINES="1 > exec_exit_15  2 3" &&
 962         export FAKE_LINES &&
 963         test_when_finished "git rebase --abort" &&
 964         ONTO=$(git rev-parse --short HEAD~3) &&
 965         COMMIT4=$(git rev-parse --short HEAD) &&
 966         COMMIT3=$(git rev-parse --short HEAD^) &&
 967         COMMIT2=$(git rev-parse --short HEAD^^) &&
 968         test_must_fail git rebase -i HEAD~3 &&
 969         cat >expected <<EOF &&
 970 interactive rebase in progress; onto $ONTO
 971 Last commands done (2 commands done):
 972    pick $COMMIT2 two_commit
 973    exec exit 15
 974 Next commands to do (2 remaining commands):
 975    pick $COMMIT3 three_commit
 976    pick $COMMIT4 four_commit
 977   (use "git rebase --edit-todo" to view and edit)
 978 You are currently editing a commit while rebasing branch '\''several_commits'\'' on '\''$ONTO'\''.
 979   (use "git commit --amend" to amend the current commit)
 980   (use "git rebase --continue" once you are satisfied with your changes)
 981
 982 nothing to commit (use -u to show untracked files)
 983 EOF
 984         git status --untracked-files=no >actual &&
 985         test_cmp expected actual
 986 '
 987
 988 test_expect_success 'status: two remaining commands with some white lines in todo file' '
 989         FAKE_LINES="1 2 exec_exit_15 3 > 4" &&
 990         export FAKE_LINES &&
 991         test_when_finished "git rebase --abort" &&
 992         ONTO=$(git rev-parse --short HEAD~4) &&
 993         COMMIT4=$(git rev-parse --short HEAD) &&
 994         COMMIT3=$(git rev-parse --short HEAD^) &&
 995         COMMIT2=$(git rev-parse --short HEAD^^) &&
 996         test_must_fail git rebase -i HEAD~4 &&
 997         cat >expected <<EOF &&
 998 interactive rebase in progress; onto $ONTO
 999 Last commands done (3 commands done):
1000    pick $COMMIT2 two_commit
1001    exec exit 15
1002   (see more in file .git/rebase-merge/done)
1003 Next commands to do (2 remaining commands):
1004    pick $COMMIT3 three_commit
1005    pick $COMMIT4 four_commit
1006   (use "git rebase --edit-todo" to view and edit)
1007 You are currently editing a commit while rebasing branch '\''several_commits'\'' on '\''$ONTO'\''.
1008   (use "git commit --amend" to amend the current commit)
1009   (use "git rebase --continue" once you are satisfied with your changes)
1010
1011 nothing to commit (use -u to show untracked files)
1012 EOF
1013         git status --untracked-files=no >actual &&
1014         test_cmp expected actual
1015 '
1016
1017 test_expect_success 'status: handle not-yet-started rebase -i gracefully' '
1018         ONTO=$(git rev-parse --short HEAD^) &&
1019         COMMIT=$(git rev-parse --short HEAD) &&
1020         EDITOR="git status --untracked-files=no >actual" git rebase -i HEAD^ &&
1021         cat >expected <<EOF &&
1022 On branch several_commits
1023 No commands done.
1024 Next command to do (1 remaining command):
1025    pick $COMMIT four_commit
1026   (use "git rebase --edit-todo" to view and edit)
1027 You are currently editing a commit while rebasing branch '\''several_commits'\'' on '\''$ONTO'\''.
1028   (use "git commit --amend" to amend the current commit)
1029   (use "git rebase --continue" once you are satisfied with your changes)
1030
1031 nothing to commit (use -u to show untracked files)
1032 EOF
1033         test_cmp expected actual
1034 '
1035
1036 test_done