[PATCH v2 1/4] t3404-rebase-interactive: use the 'q_to_cr' helper
- From
SZEDER Gábor <szeder.dev@gmail.com>
- Date
- Jun 11, 2019, 13:03 UTC
- Message-ID
- <20190611130320.18499-2-szeder.dev@gmail.com>
- In-Reply-To
- <20190611130320.18499-1-szeder.dev@gmail.com>
The test 'rebase -i respects rebase.missingCommitsCheck = warn' checks the output of 'git rebase', including progress lines: it prepares the expected output from a here-doc using LFs at the end of progress lines, and converts the command's actual output by replacing the progress lines' CRs with LFs with a one-shot local helper funcion. Similar tests (in t3420) thoroughly checking 'git rebase's output do it the other way around: they leave the output of 'git rebase' as-is, and prepare the expected output with the necessary CRs in it using the common 'q_to_cr' test helper function from 'test-lib-functions.sh'.
Change this test to use the 'q_to_cr' test helper to prepare the expected output, too.
This way this test will be more consistent with other, similar tests, and it will make further updates to this test in a later patch of this series just a tad bit simpler.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> --- t/t3404-rebase-interactive.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 1723e1a858..e66e95d453 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1304,7 +1304,7 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = ignore' ' actual ' -cat >expect <<EOF +q_to_cr >expect <<EOF Warning: some commits may have been dropped accidentally. Dropped commits (newer to older): - $(git rev-list --pretty=oneline --abbrev-commit -1 master) @@ -1313,24 +1313,15 @@ To avoid this message, use "drop" to explicitly remove a commit. Use 'git config rebase.missingCommitsCheck' to change the level of warnings. The possible behaviours are: ignore, warn, error. -Rebasing (1/4) -Rebasing (2/4) -Rebasing (3/4) -Rebasing (4/4) -Successfully rebased and updated refs/heads/missing-commit. +Rebasing (1/4)QRebasing (2/4)QRebasing (3/4)QRebasing (4/4)QSuccessfully rebased and updated refs/heads/missing-commit. EOF -cr_to_nl () { - tr '\015' '\012' -} - test_expect_success 'rebase -i respects rebase.missingCommitsCheck = warn' ' test_config rebase.missingCommitsCheck warn && rebase_setup_and_clean missing-commit && set_fake_editor && FAKE_LINES="1 2 3 4" \ - git rebase -i --root 2>actual.2 && - cr_to_nl <actual.2 >actual && + git rebase -i --root 2>actual && test_i18ncmp expect actual && test D = $(git cat-file commit HEAD | sed -ne \$p) '
-- 2.22.0.566.g58873a45ff