From: Jeff King <peff@peff.net>
To: Johannes Gilger <heipei@hackvalue.de>
Cc: Git ML <git@vger.kernel.org>, Thomas Rast <trast@student.ethz.ch>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCHv3] pretty: Initialize notes if %N is used
Date: Tue, 13 Apr 2010 07:07:24 -0400 [thread overview]
Message-ID: <20100413110723.GA2910@coredump.intra.peff.net> (raw)
In-Reply-To: <1271156465-7302-1-git-send-email-heipei@hackvalue.de>
On Tue, Apr 13, 2010 at 01:01:05PM +0200, Johannes Gilger wrote:
> Introduced space when calling userformat_find_requirements and dealt
> with %+N and %-N during the strbuf_expand phase. I hope strncmp is the
> right way to do it here. strbuf is NUL-terminated so there should not
> be a problem.
Ugh. I didn't even know we had such a thing. Those look like the only
ones that should be a problem, though. I'm glad to have factored out the
"want" code, now. At least it will all be in one spot.
> +static size_t userformat_want_item(struct strbuf *sb, const char *placeholder,
> + void *context)
> +{
> + struct userformat_want *w = context;
> +
> + switch (*placeholder) {
> + case '-':
> + case '+':
> + if (!strncmp(placeholder+1, "N", 1))
> + w->notes = 1;
> + case 'N': w->notes = 1;
> + }
> + return 0;
> +}
Should this perhaps be:
if (*placeholder == '+' || *placeholder == '-')
placeholder++;
switch (*placeholder) {
case 'N': w->notes = 1; break;
}
so that it will extend naturally if other placeholder lookups are needed
(since those ones also could have + or - markers).
Also, I just noticed that your case is missing a 'break'. Not a bug yet,
but it will be if somebody adds a new case. This is almost certainly my
fault from the original version I posted. :)
-Peff
next prev parent reply other threads:[~2010-04-13 11:08 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-05 11:55 [PATCH] Initialize notes trees if %N is used and no --show-notes given Johannes Gilger
2010-04-06 5:32 ` Jeff King
2010-04-06 9:27 ` Thomas Rast
2010-04-06 11:19 ` Johannes Gilger
2010-04-06 11:52 ` Thomas Rast
2010-04-06 16:22 ` Jeff King
2010-04-07 6:18 ` Junio C Hamano
2010-04-07 6:36 ` Jeff King
2010-04-10 7:05 ` [PATCH] pretty.c: Don't expand %N without --show-notes Johannes Gilger
2010-04-10 20:00 ` Junio C Hamano
2010-04-10 21:30 ` [PATCH] Notes: Connect the %N flag to --{show,no}-notes Johannes Gilger
2010-04-10 21:51 ` Junio C Hamano
2010-04-10 22:08 ` Jeff King
2010-04-11 14:54 ` [PATCH] pretty: Initialize notes if %N is used Johannes Gilger
2010-04-12 8:56 ` Jeff King
2010-04-13 8:59 ` [PATCHv2] " Johannes Gilger
2010-04-13 10:03 ` Jeff King
2010-04-13 10:36 ` Johannes Gilger
2010-04-13 10:57 ` [PATCHv3] " y
2010-04-13 10:57 ` y
2010-04-13 11:01 ` Johannes Gilger
2010-04-13 11:07 ` Jeff King [this message]
2010-04-13 11:26 ` [PATCHv4] " Johannes Gilger
2010-04-13 20:01 ` Junio C Hamano
2010-04-13 20:31 ` [PATCHv5] " Johannes Gilger
2010-04-10 22:20 ` [PATCH] Notes: Connect the %N flag to --{show,no}-notes Johannes Gilger
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100413110723.GA2910@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=heipei@hackvalue.de \
--cc=trast@student.ethz.ch \
/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.
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 NNTP newsgroup(s).