]> git.ipfire.org Git - thirdparty/git.git/commitdiff
log, show: add tests for messages containing CRLF
authorPhilippe Blain <levraiphilippeblain@gmail.com>
Thu, 29 Oct 2020 12:48:29 +0000 (12:48 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Oct 2020 19:57:45 +0000 (12:57 -0700)
A previous commit adjusted the code in ref-filter.c so that messages
containing CRLF are now correctly parsed and displayed.

Add tests to also check that `git log` and `git show` correctly handle
such messages, to prevent futur regressions if these commands are
refactored to use the ref-filter API.

Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3920-crlf-messages.sh

index 3f0ce02c3f07256f6e680f11fc068fe59c82e7d6..70ddce3a2eb48613350891e7ba189487e2b5ec7a 100755 (executable)
@@ -105,4 +105,22 @@ test_crlf_subject_body_and_contents tag --list tag-crlf*
 
 test_crlf_subject_body_and_contents for-each-ref refs/heads/crlf*
 
+test_expect_success 'log: --oneline works with messages using CRLF' '
+       for branch in $LIB_CRLF_BRANCHES
+       do
+               cat .crlf-subject-${branch}.txt >expect &&
+               printf "\n" >>expect &&
+               git log --oneline -1 ${branch} >tmp-branch &&
+               git log --oneline -1 tag-${branch} >tmp-tag &&
+               cut -d" " -f2- <tmp-branch >actual-branch &&
+               cut -d" " -f2- <tmp-tag >actual-tag &&
+               test_cmp expect actual-branch &&
+               test_cmp expect actual-tag || return 1
+       done
+'
+
+test_crlf_subject_body_and_contents log --all --reverse --grep Subject
+
+test_crlf_subject_body_and_contents show $LIB_CRLF_BRANCHES
+
 test_done