From: Jonathan Nieder <jrnieder@gmail.com>
To: Brandon Casey <drafnel@gmail.com>
Cc: git@vger.kernel.org, pclouds@gmail.com, gitster@pobox.com,
Brandon Casey <bcasey@nvidia.com>
Subject: Re: [PATCH v3 08/11] sequencer.c: teach append_signoff to avoid adding a duplicate newline
Date: Sun, 27 Jan 2013 19:23:02 -0800 [thread overview]
Message-ID: <20130128032302.GL8206@elie.Belkin> (raw)
In-Reply-To: <1359335515-13818-9-git-send-email-drafnel@gmail.com>
Brandon Casey wrote:
> Teach append_signoff to detect whether a blank line exists at the position
> that the signed-off-by line will be added, and avoid adding an additional
> one if one already exists. This is necessary to allow format-patch to add a
> s-o-b to a patch with no commit message without adding an extra newline.
I assume this means you're preserving historical behavior when adding
a sign-off to a commit with empty description (which is a good thing),
but what is that behavior? Is it a deliberate choice or something
that developed by default?
[...]
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -1118,11 +1118,15 @@ void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag)
> for (i = msgbuf->len - 1 - ignore_footer; i > 0 && msgbuf->buf[i - 1] != '\n'; i--)
> ; /* do nothing */
>
> - if (i)
> - has_footer = has_conforming_footer(msgbuf, &sob, ignore_footer);
> -
> - if (!has_footer)
> - strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0, "\n", 1);
> + if (msgbuf->buf[i] != '\n') {
> + if (i)
> + has_footer = has_conforming_footer(msgbuf, &sob,
> + ignore_footer);
> +
> + if (!has_footer)
> + strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0,
> + "\n", 1);
> + }
>
> if (has_footer != 3 && (!no_dup_sob || has_footer != 2))
This is too much nesting for my small mind to keep track of. Am I
correct in imagining the effect is the same as the following?
has_footer = has_conforming_footer(...)
if (!has_footer && msgbuf->buf[i] != '\n')
strbuf_splice(...); /* add blank line */
if (has_footer != 3 && ...
next prev parent reply other threads:[~2013-01-28 3:23 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-28 1:11 [PATCH v3 00/11] unify appending of sob Brandon Casey
2013-01-28 1:11 ` [PATCH v3 01/11] sequencer.c: rework search for start of footer to improve clarity Brandon Casey
2013-01-28 1:27 ` Jonathan Nieder
2013-01-28 1:11 ` [PATCH v3 02/11] commit, cherry-pick -s: remove broken support for multiline rfc2822 fields Brandon Casey
2013-01-28 1:29 ` Jonathan Nieder
2013-01-28 1:11 ` [PATCH v3 03/11] t/test-lib-functions.sh: allow to specify the tag name to test_commit Brandon Casey
2013-01-28 1:11 ` [PATCH v3 04/11] t/t3511: add some tests of 'cherry-pick -s' functionality Brandon Casey
2013-01-28 2:08 ` Jonathan Nieder
2013-01-28 1:11 ` [PATCH v3 05/11] sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer Brandon Casey
2013-01-28 2:21 ` Jonathan Nieder
2013-01-28 2:51 ` Jonathan Nieder
2013-01-28 5:38 ` Brandon Casey
2013-01-28 1:11 ` [PATCH v3 06/11] sequencer.c: always separate "(cherry picked from" from commit body Brandon Casey
2013-01-28 2:34 ` Jonathan Nieder
2013-02-10 23:25 ` Brandon Casey
2013-01-28 1:11 ` [PATCH v3 07/11] sequencer.c: teach append_signoff how to detect duplicate s-o-b Brandon Casey
2013-01-28 3:08 ` Jonathan Nieder
2013-01-28 3:14 ` Jonathan Nieder
2013-02-10 23:36 ` Brandon Casey
2013-01-28 1:11 ` [PATCH v3 08/11] sequencer.c: teach append_signoff to avoid adding a duplicate newline Brandon Casey
2013-01-28 3:23 ` Jonathan Nieder [this message]
2013-01-28 1:11 ` [PATCH v3 09/11] t4014: more tests about appending s-o-b lines Brandon Casey
2013-01-28 3:31 ` Jonathan Nieder
2013-01-28 5:42 ` Junio C Hamano
2013-01-28 5:51 ` Junio C Hamano
2013-01-28 1:11 ` [PATCH v3 10/11] format-patch: update append_signoff prototype Brandon Casey
2013-01-28 3:35 ` Jonathan Nieder
2013-01-28 1:11 ` [PATCH v3 11/11] Unify appending signoff in format-patch, commit and sequencer Brandon Casey
2013-01-28 3:39 ` Jonathan Nieder
2013-02-10 23:55 ` Brandon Casey
2013-02-11 9:00 ` Jonathan Nieder
2013-02-11 18:49 ` Brandon Casey
2013-01-28 3:48 ` [PATCH v3 00/11] unify appending of sob Jonathan Nieder
2013-01-28 5:49 ` Junio C Hamano
2013-01-30 17:37 ` Junio C Hamano
2013-01-31 18:45 ` 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=20130128032302.GL8206@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).