From e16ad989c85c55bdfcf45fe561911a699e962b44 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 16 Jun 2017 15:39:35 +0200 Subject: [PATCH 3/4] fixup! rebase: add more regression tests for console output Signed-off-by: Johannes Schindelin --- t/t3420-rebase-autostash.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 64904bef069..2c01ae6ad2a 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -102,14 +102,13 @@ create_expected_failure_am() { } create_expected_failure_interactive() { - cr=$(echo . | tr '.' '\015') && - cat >expected <<-EOF + q_to_cr >expected <<-EOF $(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual) HEAD is now at $(git rev-parse --short feature-branch) third commit - Rebasing (1/2)${cr}Rebasing (2/2)${cr}Successfully rebased and updated refs/heads/rebased-feature-branch. - Applying autostash resulted in conflicts. + Rebasing (1/2)QRebasing (2/2)QApplying autostash resulted in conflicts. Your changes are safe in the stash. You can run "git stash pop" or "git stash drop" at any time. + Successfully rebased and updated refs/heads/rebased-feature-branch. EOF } -- 2.12.2.windows.1