From 5c99995df8ee3b02224f0e2e86a3d1e4bb2f7348 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 30 Aug 2015 21:14:40 +0200 Subject: trailer: support multiline title We currently ignore the first line passed to `git interpret-trailers`, when looking for the beginning of the trailers. Unfortunately this does not work well when a commit is created with a line break in the title, using for example the following command: git commit -m 'place of code: change we made' That's why instead of ignoring only the first line, it is better to ignore the first paragraph. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano --- t/t7513-interpret-trailers.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 't/t7513-interpret-trailers.sh') diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh index 8f1f55be25..1abec57f6e 100755 --- a/t/t7513-interpret-trailers.sh +++ b/t/t7513-interpret-trailers.sh @@ -112,6 +112,20 @@ test_expect_success 'with only a title in the message' ' test_cmp expected actual ' +test_expect_success 'with multiline title in the message' ' + cat >expected <<-\EOF && + place of + code: change + + Reviewed-by: Peff + Acked-by: Johan + EOF + printf "%s\n" "place of" "code: change" | + git interpret-trailers --trailer "Reviewed-by: Peff" \ + --trailer "Acked-by: Johan" >actual && + test_cmp expected actual +' + test_expect_success 'with config setup' ' git config trailer.ack.key "Acked-by: " && cat >expected <<-\EOF && -- cgit v1.2.3