Re: [PATCH] am: match --signoff to the original scripted version

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 8, 2015, 18:14 UTC
Message-ID: <xmqqlhcg93t3.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20150908062523.GE26331@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 20 quoted lines

> On Sat, Sep 05, 2015 at 09:56:27PM -0700, Junio C Hamano wrote:
>
>> +static void am_signoff(struct strbuf *sb)
>> +{
>> +	char *cp;
>> +	struct strbuf mine = STRBUF_INIT;
>> +
>> +	/* Does it end with our own sign-off? */
>> +	strbuf_addf(&mine, "\n%s%s\n",
>> +		    sign_off_header,
>> +		    fmt_name(getenv("GIT_COMMITTER_NAME"),
>> +			     getenv("GIT_COMMITTER_EMAIL")));
>> +	if (mine.len < sb->len &&
>> +	    !strcmp(mine.buf, sb->buf + sb->len - mine.len))
>> +		goto exit; /* no need to duplicate */
>
> Here you insert the "\n" directly at the start of "mine", so the test
> "does it contain S-o-b at the beginning of a line" does not count the
> first line. Probably fine, as somebody putting a S-o-b in their subject
> deserves whatever they get.

Yup.

Show 9 quoted lines

>> +	/* Does it have any Signed-off-by: in the text */
>> +	for (cp = sb->buf;
>> +	     cp && *cp && (cp = strstr(cp, sign_off_header)) != NULL;
>> +	     cp = strchr(cp, '\n')) {
>> +		if (sb->buf == cp || cp[-1] == '\n')
>> +			break;
>> +	}
>
> Here you are more careful about finding S-o-b at sb->buf.

It is not being careful for that, actually. It just is avoiding to access sb->buf[-1], which would be a realproblem. "The beginning of buffer is also at the beginning of a line" is merely a happy side effect ;-).