Re: More builtin git-am issues..

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 5, 2015, 01:06 UTC
Message-ID: <xmqqd1xxekt8.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <CA+55aFzN4SnenchxPScn61_apzitGAPtoYEd49iLZPxgK0KQGw@mail.gmail.com>

Linus Torvalds <torvalds@linux-foundation.org> writes:

Show 22 quoted lines

> but the failing cases have a comment by Andrew:
>
>     [akpm@linux-foundation.org: coding-style fixes]
>     Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
>     Cc: Xishi Qiu <qiuxishi@huawei.com>
>     Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
>     Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
>     Cc: Taku Izumi <izumi.taku@jp.fujitsu.com>
>     Cc: Gu Zheng <guz.fnst@cn.fujitsu.com>
>     Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
>     Cc: Vlastimil Babka <vbabka@suse.cz>
>     Cc: Mel Gorman <mgorman@techsingularity.net>
>     Cc: David Rientjes <rientjes@google.com>
>     Cc: <stable@vger.kernel.org>        [4.2.x]
>     Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
>
>     Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
>
> ie that "[akpm@linux-foundation.org: coding-style fixes]" makes git am
> now decide that the previous block of text was not a sign-off block,
> so it adds an empty line before adding my sign-off. But very obviously
> it *was* a sign-off block.

Ahh, OK, scratch what I said earlier. The user intended this to be sign-off block, but the convention append_signoff() was taught from very earlier days is that the sign-off block must consist of block of text all of which look like rfc2822 "keyword: value" header lines, and the comment thing makes it a non-conforming header.

Perhaps

    A block of text at the end of the existing text could be a
    signature block.  If all its lines that are rfc2822-like are at
    its end, then it is a sign-off block.  Otherwise it is not.

would allow the leading non-signature lines in the above example.

If the comment line (which I would say should have been separated by a blank line from the signature block if only to make it easier to read the whole thing) were in the middle, e.g.

Show 9 quoted lines

>     Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
>     Cc: Xishi Qiu <qiuxishi@huawei.com>
>     Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
>     Cc: Vlastimil Babka <vbabka@suse.cz>
>     Cc: Mel Gorman <mgorman@techsingularity.net>
>     [akpm@linux-foundation.org: coding-style fixes]
>     Cc: David Rientjes <rientjes@google.com>
>     Cc: <stable@vger.kernel.org>        [4.2.x]
>     Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

that rule would still not think this is a signature block, but at that point, do we really want to consider such a block of text a signature block?