Re: [PATCH v3 07/11] sequencer.c: teach append_signoff how to detect duplicate s-o-b

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Jan 28, 2013, 03:14 UTC
Message-ID: <20130128031424.GK8206@elie.Belkin>
In-Reply-To: <1359335515-13818-8-git-send-email-drafnel@gmail.com>

Brandon Casey wrote:

> --- a/sequencer.c
> +++ b/sequencer.c

[...]

Show 12 quoted lines

> @@ -1096,10 +1117,16 @@ void append_signoff(struct strbuf *msgbuf, int ignore_footer)
>  	strbuf_addch(&sob, '\n');
>  	for (i = msgbuf->len - 1 - ignore_footer; i > 0 && msgbuf->buf[i - 1] != '\n'; i--)
>  		; /* do nothing */
> -	if (prefixcmp(msgbuf->buf + i, sob.buf)) {
> -		if (!i || !has_conforming_footer(msgbuf, ignore_footer))
> -			strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0, "\n", 1);
> -		strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0, sob.buf, sob.len);
> -	}
> +
> +	if (i)
> +		has_footer = has_conforming_footer(msgbuf, &sob, ignore_footer);

Is this "if (i)" test needed? I'd expect that if the message has no newlines, has_conforming_footer() would notice that and return 0.