Re: [PATCH 4/4] sequencer: use trailer's trailer layout

From: Jonathan Tan <jonathantanmy@google.com>
Date: Nov 1, 2016, 17:38 UTC
Message-ID: <a416ab9b-ff1f-9a71-3e58-60fd4f8a6b8e@google.com>
In-Reply-To: <xmqqeg2wqa1e.fsf@gitster.mtv.corp.google.com>

On 10/31/2016 06:11 PM, Junio C Hamano wrote:

Show 21 quoted lines

> Jonathan Tan <jonathantanmy@google.com> writes:
>> diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
>> index ba4902d..635b394 100755
>> --- a/t/t4014-format-patch.sh
>> +++ b/t/t4014-format-patch.sh
>> @@ -1277,8 +1277,7 @@ EOF
>>  4:Subject: [PATCH] subject
>>  8:
>>  9:I want to mention about Signed-off-by: here.
>> -10:
>> -11:Signed-off-by: C O Mitter <committer@example.com>
>> +10:Signed-off-by: C O Mitter <committer@example.com>
>>  EOF
>>  	test_cmp expected actual
>>  '
>
> The original log message is a single-liner subject line, blank, "I
> want to mention..." and when asked to append S-o-b:, we would want
> to see a blank before the added S-o-b, no?
>
> This seems a bit weird.

This is because the "I want to mention" block has 100% trailer lines (since its only line contains a colon). We could forbid spaces in trailer field names, but as you said [1], it might be better to allow them since users might include them.

The original sequencer.c interpreted this block as not a trailer block, because it only accepted alphanumeric characters or '-' before the colon (and no spaces) - hence the difference in behavior.

[1] <xmqqbmyhr4vt.fsf@gitster.mtv.corp.google.com>