diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-02 19:50:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-02 19:50:21 (GMT) |
| commit | cdd00dfe9431b431e488d0bb77d39f1461a9dcc5 (patch) | |
| tree | ad2fad0185d31fe40e21deec894f23dc202edfea /t/t7513-interpret-trailers.sh | |
| parent | 8f8386eeb43e12a6c9704915994e6075a5a9b1cf (diff) | |
| parent | 5c99995df8ee3b02224f0e2e86a3d1e4bb2f7348 (diff) | |
| download | git-cdd00dfe9431b431e488d0bb77d39f1461a9dcc5.zip git-cdd00dfe9431b431e488d0bb77d39f1461a9dcc5.tar.gz git-cdd00dfe9431b431e488d0bb77d39f1461a9dcc5.tar.bz2 | |
Merge branch 'cc/trailers-corner-case-fix'
The "interpret-trailers" helper mistook a multi-paragraph title of
a commit log message with a colon in it as the end of the trailer
block.
* cc/trailers-corner-case-fix:
trailer: support multiline title
Diffstat (limited to 't/t7513-interpret-trailers.sh')
| -rwxr-xr-x | t/t7513-interpret-trailers.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh index 9577b4e..322c436 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 && |