From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] C: use skip-prefix to avoid hardcoded string length
Date: Mon, 27 Jan 2020 16:45:35 -0800 [thread overview]
Message-ID: <xmqq36c09zo0.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20200127232004.GE19360@coredump.intra.peff.net> (Jeff King's message of "Mon, 27 Jan 2020 18:20:04 -0500")
Jeff King <peff@peff.net> writes:
>> + else if (skip_prefix(arg, "--expire=", &valptr)) {
>> + if (parse_expiry_date(valptr, &cb.cmd.expire_total))
>> die(_("'%s' is not a valid timestamp"), arg);
>> explicit_expiry |= EXPIRE_TOTAL;
>> }
>
> In this case, I think the die message in the context could be improved
> to show "valptr". At which point you might as well do:
>
> else if (skip_prefix(arg, "--expire=", &arg)) {
The version that loses "to which parameter did I give malformed
timestamp?" information was what I originally have written, and then
I added a new valptr variable to avoid the information loss and
message change.
But thinking about it again,
git frotz --expire=tea --expire-unreachable=tee
would say "I don't know 'tee'" and then the user can go back and see
to which one the misspelt version went, and if the user did
git frotz --expire=tee --expire-unreachable=tee
and got "I don't know 'tee'", then it also is OK to give that
without saying it is about --expire or --expire-unreachable; they
are both wrong ;-)
So, I guess it probably is a good idea to skip the option name in
the error message (we might have to adjust some tests, though).
Thanks.
>> - else if (starts_with(arg, "--expire-unreachable=")) {
>> - if (parse_expiry_date(arg + 21, &cb.cmd.expire_unreachable))
>> + else if (skip_prefix(arg, "--expire-unreachable=", &valptr)) {
>> + if (parse_expiry_date(valptr, &cb.cmd.expire_unreachable))
>> die(_("'%s' is not a valid timestamp"), arg);
>> explicit_expiry |= EXPIRE_UNREACH;
>> }
>
> Ditto here.
>
> -Peff
next prev parent reply other threads:[~2020-01-28 0:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-27 22:21 [PATCH] C: use skip-prefix to avoid hardcoded string length Junio C Hamano
2020-01-27 23:20 ` Jeff King
2020-01-28 0:45 ` Junio C Hamano [this message]
2020-01-30 19:35 ` [PATCH v2] " Junio C Hamano
2020-01-31 0:19 ` Jeff King
2020-01-31 20:15 ` Andrei Rybak
2020-01-31 21:03 ` Junio C Hamano
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=xmqq36c09zo0.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).