[PATCH v2 3/3] log: add tests for messages containing CRLF to t4202
- From
Philippe Blain via GitGitGadget <gitgitgadget@gmail.com>
- Date
- Mar 10, 2020, 02:24 UTC
- Message-ID
- <c84092e457c873e18548b647e2c672b737abcb24.1583807093.git.gitgitgadget@gmail.com>
- In-Reply-To
- <pull.576.v2.git.1583807093.gitgitgadget@gmail.com>
From: Philippe Blain <levraiphilippeblain@gmail.com>
A previous commit fixed a bug in the ref-filter API causing messages containing CRLF to be incorrectly parsed and displayed.
Add a test to also check that `git log` correctly handles such messages, to prevent futur regressions.
Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com> --- t/t4202-log.sh | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 4694b6d0ce7..1e6149372c5 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -6,6 +6,7 @@ test_description='git log' . "$TEST_DIRECTORY/lib-gpg.sh" . "$TEST_DIRECTORY/lib-terminal.sh" . "$TEST_DIRECTORY/lib-log-graph.sh" +. "$TEST_DIRECTORY/lib-crlf-messages.sh" test_cmp_graph () { lib_test_cmp_graph --format=%s "$@" @@ -105,6 +106,29 @@ test_expect_success 'oneline' ' test_cmp expect actual ' +test_create_crlf_refs + +test_expect_success 'oneline with CRLF messages' ' + echo "002093e Subject first line" >expect && + git log --oneline -1 crlf >actual-branch && + git log --oneline -1 tag-crlf >actual-tag && + test_cmp expect actual-branch && + test_cmp expect actual-tag && + echo "6f814b0 Subject first line" >expect && + git log --oneline -1 crlf-empty-lines-after-subject >actual-branch && + git log --oneline -1 tag-crlf-empty-lines-after-subject >actual-tag && + test_cmp expect actual-branch && + test_cmp expect actual-tag && + echo "8c58a85 Subject first line Subject second line" >expect && + git log --oneline -1 crlf-two-line-subject >actual-branch && + git log --oneline -1 tag-crlf-two-line-subject >actual-tag && + test_cmp expect actual-branch && + test_cmp expect actual-tag +' +test_crlf_subject_body_and_contents log --all --reverse --grep Subject + +test_cleanup_crlf_refs + test_expect_success 'diff-filter=A' ' git log --no-renames --pretty="format:%s" --diff-filter=A HEAD > actual &&
-- gitgitgadget