From: Jonathan Nieder <jrnieder@gmail.com>
To: Brandon Casey <drafnel@gmail.com>
Cc: gitster@pobox.com, pclouds@gmail.com, git@vger.kernel.org,
Brandon Casey <bcasey@nvidia.com>
Subject: Re: [PATCH v2 01/10] sequencer.c: remove broken support for rfc2822 continuation in footer
Date: Mon, 21 Jan 2013 23:54:13 -0800 [thread overview]
Message-ID: <20130122075413.GB6085@elie.Belkin> (raw)
In-Reply-To: <1358757627-16682-2-git-send-email-drafnel@gmail.com>
Hi,
Brandon Casey wrote:
> --- a/sequencer.c
> +++ b/sequencer.c
[...]
> @@ -1042,13 +1041,8 @@ static int ends_rfc2822_footer(struct strbuf *sb, int ignore_footer)
Git is checking if (sb->buf) ends with a "Signed-off-by:" style
line. If it doesn't, it will need to add an extra blank line
before adding a new sign-off.
First (snipped), it seeks back two newlines from the end and then
forward to the next non-newline character, so (buf + i) is at the
start of the last line of (the interesting part of) sb. Now:
> for (; i < len; i = k) {
> for (k = i; k < len && buf[k] != '\n'; k++)
> ; /* do nothing */
> k++;
(buf + k) points to the end of this line.
> - if ((buf[k] == ' ' || buf[k] == '\t') && !first)
> - continue;
This is always the first line examined, so this "continue" never
triggers.
> -
> - first = 0;
> -
> for (j = 0; i + j < len; j++) {
If the line matches /^[[:alnum:]-]*:/, it passes and git moves on to
the (nonexistent) next line. Otherwise, it fails.
Do I understand correctly? If so, this patch should be a no-op, which
is good, I guess.
But in that case, couldn't this function be made much simpler? As far
as I can tell, all the function needs to do is the following:
1. Find the last line.
2. Check if it is blank or matches /^[[:alnum:]-]*:/
3. There is no step 3. That's it.
In other words, something like:
const char *eol, *p;
/* End of line */
eol = memrchr(sb->buf, '\n', sb->len - ignore_footer);
if (!eol)
eol = sb->buf;
/* Start of line */
p = memrchr(sb->buf, '\n', eol - sb->buf);
if (p)
p++;
else
p = sb->buf;
if (p == eol) /* Blank line? */
return 1;
/* "Signed-off-by"-style field */
while ((isalnum(*p) || *p == '-') && p < eol)
p++;
return *p == ':';
where memrchr is defined roughly as follows[1]:
#ifdef __GLIBC_PREREQ
#if __GLIBC_PREREQ(2, 2)
#define HAVE_MEMRCHR
#endif
#endif
#ifndef HAVE_MEMRCHR
#define memrchr gitmemrchr
static inline void *gitmemrchr(const void *s, int c, size_t n)
{
const unsigned char *p = s;
p += n;
while (p != s)
if (*--p == (unsigned char) c)
return p;
return NULL;
}
#endif
Does that look right?
Jonathan
[1] http://thread.gmane.org/gmane.comp.version-control.git/159081/focus=159121
next prev parent reply other threads:[~2013-01-22 7:54 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-21 8:40 [PATCH v2 00/10] unify appending of sob Brandon Casey
2013-01-21 8:40 ` [PATCH v2 01/10] sequencer.c: remove broken support for rfc2822 continuation in footer Brandon Casey
2013-01-22 7:54 ` Jonathan Nieder [this message]
2013-01-22 9:35 ` Brandon Casey
2013-01-22 9:47 ` Jonathan Nieder
2013-01-22 9:49 ` Jonathan Nieder
2013-01-22 11:08 ` Brandon Casey
2013-01-22 10:12 ` Jonathan Nieder
2013-01-22 10:21 ` Jonathan Nieder
2013-01-21 8:40 ` [PATCH v2 02/10] t/test-lib-functions.sh: allow to specify the tag name to test_commit Brandon Casey
2013-01-22 8:02 ` Jonathan Nieder
2013-01-22 9:43 ` Brandon Casey
2013-01-21 8:40 ` [PATCH v2 03/10] t/t3511: add some tests of 'cherry-pick -s' functionality Brandon Casey
2013-01-22 8:17 ` Jonathan Nieder
2013-01-27 23:33 ` Brandon Casey
2013-01-27 23:40 ` Jonathan Nieder
2013-01-21 8:40 ` [PATCH v2 04/10] sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer Brandon Casey
2013-01-22 8:27 ` Jonathan Nieder
2013-01-28 1:24 ` Jonathan Nieder
2013-01-21 8:40 ` [PATCH v2 05/10] sequencer.c: always separate "(cherry picked from" from commit body Brandon Casey
2013-01-22 8:32 ` Jonathan Nieder
2013-01-21 8:40 ` [PATCH v2 06/10] sequencer.c: teach append_signoff how to detect duplicate s-o-b Brandon Casey
2013-01-22 8:38 ` Jonathan Nieder
2013-01-28 0:36 ` Brandon Casey
2013-01-28 2:06 ` Junio C Hamano
2013-02-09 23:06 ` Junio C Hamano
2013-02-09 23:49 ` Brandon Casey
2013-01-21 8:40 ` [PATCH v2 07/10] sequencer.c: teach append_signoff to avoid adding a duplicate newline Brandon Casey
2013-01-21 8:40 ` [PATCH v2 08/10] t4014: more tests about appending s-o-b lines Brandon Casey
2013-01-21 8:40 ` [PATCH v2 09/10] format-patch: update append_signoff prototype Brandon Casey
2013-01-21 8:40 ` [PATCH v2 10/10] Unify appending signoff in format-patch, commit and sequencer Brandon Casey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130122075413.GB6085@elie.Belkin \
--to=jrnieder@gmail.com \
--cc=bcasey@nvidia.com \
--cc=drafnel@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).