Re: [PATCH] commit -s: allow "(cherry picked " lines in sign-off section
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Nov 16, 2010, 20:40 UTC
- Message-ID
- <20101116204027.GB27390@burratino>
- In-Reply-To
- <20101116202556.GA27390@burratino>
Jonathan Nieder wrote:
Show 6 quoted lines
> (cherry picked from commit 9d8117e72bf453dd9d85e0cd322ce4a0f8bccbc0) > > Signed-off-by: Back Porter <backporter@example.com> > > The cherry-pick is a step in the line of a patch like any other, > so one might prefer to lose the extra newline.
Sigh. s/line/life/
[...]
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Let's kick off the reviews.
Show 8 quoted lines
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -528,6 +528,8 @@ static int ends_rfc2822_footer(struct strbuf *sb)
> i++;
>
> for (; i < len; i = k) {
> + static const char cherry_pick[] = "(cherry picked from commit ";
> +Better to share this string with builtin/revert.c, no?
What would happen when "(cherry picked ..." gets translated? Should only the current language's version be tolerated in the commit footer, or is there something more generic to match for that could take care of wording changes automatically?
Show 9 quoted lines
> @@ -535,6 +537,20 @@ static int ends_rfc2822_footer(struct strbuf *sb)
> if ((buf[k] == ' ' || buf[k] == '\t') && !first)
> continue;
>
> + if (!first && buf[k] == '(' && k + strlen(cherry_pick) < len) {
> + /* Might be a cherry-pick notice. */
> + const char *p = buf + k;
> + if (!memcmp(p, cherry_pick, strlen(cherry_pick))) {
> + p = memchr(buf + k, '\n', len - k);Maybe simpler:
p = memchr(... if (!p) return 0; i = p - buf;
to reuse the termination condition in the sign-off parser.
Presumably the main loop could use memchr() instead of open-coding it as well.