From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> These patches add some tests for the fixes I sent the week before last. The output tests check the messages for stashes that apply and fail for all three variants of rebase. They are quite strict but I couldn't think of a better way to check that the output is correct and doesn't contain anything it isn't meant to (such as the output of git status). Phillip Wood (3): rebase -i: Add test for reflog message rebase: Add tests for console output rebase: Add tests for console output with conflicting stash t/t3404-rebase-interactive.sh | 7 +++++++ t/t3420-rebase-autostash.sh | 20 ++++++++++++++++++-- t/t3420/expected-fail-am | 8 ++++++++ t/t3420/expected-fail-interactive | 6 ++++++ t/t3420/expected-fail-merge | 32 ++++++++++++++++++++++++++++++++ t/t3420/expected-success-am | 6 ++++++ t/t3420/expected-success-interactive | 4 ++++ t/t3420/expected-success-merge | 30 ++++++++++++++++++++++++++++++ t/t3420/remove-ids.sed | 6 ++++++ 9 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 t/t3420/expected-fail-am create mode 100644 t/t3420/expected-fail-interactive create mode 100644 t/t3420/expected-fail-merge create mode 100644 t/t3420/expected-success-am create mode 100644 t/t3420/expected-success-interactive create mode 100644 t/t3420/expected-success-merge create mode 100644 t/t3420/remove-ids.sed -- 2.13.0