Christian Couder <christian.couder@xxxxxxxxx> writes:
> 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.
> ---
> t/t7513-interpret-trailers.sh | 14 ++++++++++++++
> trailer.c | 15 +++++++++++----
> 2 files changed, 25 insertions(+), 4 deletions(-)
>
> diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
> index 9577b4e..56efe88 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%s\n" "place of" "code: change" |
Just FYI, I think "%s\n" is sufficient to produce multi-line output,
e.g.
printf "%s xyzzy\n" a b c d: e:
> + 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 &&
> diff --git a/trailer.c b/trailer.c
> index b808868..6f3416f 100644
> --- a/trailer.c
> +++ b/trailer.c
> @@ -735,15 +735,22 @@ static int find_patch_start(struct strbuf **lines, int count)
> */
> static int find_trailer_start(struct strbuf **lines, int count)
> {
> - int start, only_spaces = 1;
> + int start, end_of_title, only_spaces = 1;
> +
> + /* The first paragraph is the title and cannot be trailers */
> + for (start = 0; start < count; start++) {
> + if (lines[start]->buf[0] == comment_line_char)
> + continue;
> + if (contains_only_spaces(lines[start]->buf))
> + break;
> + }
> + end_of_title = start;
>
> /*
> * Get the start of the trailers by looking starting from the end
> * for a line with only spaces before lines with one separator.
> - * The first line must not be analyzed as the others as it
> - * should be either the message title or a blank line.
> */
> - for (start = count - 1; start >= 1; start--) {
> + for (start = count - 1; start >= end_of_title; start--) {
> if (lines[start]->buf[0] == comment_line_char)
> continue;
> if (contains_only_spaces(lines[start]->buf)) {
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html