mirror of
https://github.com/git/git
synced 2024-08-28 03:59:25 +00:00
trailer: add test with an old style conflict block
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
61cfef4ca4
commit
3d24a7267d
|
@ -213,7 +213,7 @@ test_expect_success 'with 2 files arguments' '
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'with message that has comments' '
|
test_expect_success 'with message that has comments' '
|
||||||
cat basic_message >>message_with_comments &&
|
cat basic_message >message_with_comments &&
|
||||||
sed -e "s/ Z\$/ /" >>message_with_comments <<-\EOF &&
|
sed -e "s/ Z\$/ /" >>message_with_comments <<-\EOF &&
|
||||||
# comment
|
# comment
|
||||||
|
|
||||||
|
@ -240,6 +240,36 @@ test_expect_success 'with message that has comments' '
|
||||||
test_cmp expected actual
|
test_cmp expected actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'with message that has an old style conflict block' '
|
||||||
|
cat basic_message >message_with_comments &&
|
||||||
|
sed -e "s/ Z\$/ /" >>message_with_comments <<-\EOF &&
|
||||||
|
# comment
|
||||||
|
|
||||||
|
# other comment
|
||||||
|
Cc: Z
|
||||||
|
# yet another comment
|
||||||
|
Reviewed-by: Johan
|
||||||
|
Reviewed-by: Z
|
||||||
|
# last comment
|
||||||
|
|
||||||
|
Conflicts:
|
||||||
|
|
||||||
|
EOF
|
||||||
|
cat basic_message >expected &&
|
||||||
|
cat >>expected <<-\EOF &&
|
||||||
|
# comment
|
||||||
|
|
||||||
|
Reviewed-by: Johan
|
||||||
|
Cc: Peff
|
||||||
|
# last comment
|
||||||
|
|
||||||
|
Conflicts:
|
||||||
|
|
||||||
|
EOF
|
||||||
|
git interpret-trailers --trim-empty --trailer "Cc: Peff" message_with_comments >actual &&
|
||||||
|
test_cmp expected actual
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success 'with commit complex message and trailer args' '
|
test_expect_success 'with commit complex message and trailer args' '
|
||||||
cat complex_message_body >expected &&
|
cat complex_message_body >expected &&
|
||||||
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
|
||||||
|
|
Loading…
Reference in a new issue