From: Junio C Hamano <gitster@pobox.com>
To: "Wolfgang Müller" <wolf@oriole.systems>
Cc: git@vger.kernel.org
Subject: Re: [RFC PATCH] rev-parse: fix segfault with missing --path-format argument
Date: Mon, 17 May 2021 06:59:18 +0900 [thread overview]
Message-ID: <xmqqk0ny5oi1.fsf@gitster.g> (raw)
In-Reply-To: <20210516143156.mauc2ukryx5j2e2r@nabokov.fritz.box> ("Wolfgang =?utf-8?Q?M=C3=BCller=22's?= message of "Sun, 16 May 2021 16:31:56 +0200")
Wolfgang Müller <wolf@oriole.systems> writes:
> On 2021-05-16 21:53, Junio C Hamano wrote:
>
>> As die() is end-user facing, you'd probably want
>>
>> die(_("--path-format requires an argument"));
>>
>> We do have untranslated die() nearby for the same option, which may
>> want to be cleaned up either in a preliminary patch, or in this same
>> patch as an unrelated fix "while we are at it".
>
> I would not mind preparing a preliminary patch that cleans up all
> untranslated user-facing calls to die(). My editor finds 15 of those in
> rev-parse.c, and I think they all qualify.
>
> If you'd rather not touch unrelated code paths I'll instead include it
> in v2 as an unrelated fix in the same commit.
I am puzzled by the last paragraph. Somebody who does not want to
see "unrelated" codepaths touched would appreciate if a commit that
fixes this segfault does not touch them at the same time.
In any case, I now counted existing die() messages in this file, and
among 15 of them, only 1 is marked with _(...). I think that it
is the best to apply the patch as-is (without _(...)), adding one
untranslated message to the file.
Then, on top of this change, the 15 untranslated messages can be
marked with _(...) a separate commit (and it does not even have to
be done by you).
> I think I initially went for "--path-format --show-toplevel" because I
> was under the assumption that --path-format needs another option it can
> modify. It seems that this is not the case, so wouldn't it be simpler
> here to do the following instead:
>
> test_must_fail git rev-parse --path-format
>
> That way we do not have to worry about subsequent changes to other,
> unrelated, options.
That's good, too. Simple.
Thanks.
next prev parent reply other threads:[~2021-05-16 21:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-16 12:04 [RFC PATCH] rev-parse: fix segfault with missing --path-format argument Wolfgang Müller
2021-05-16 12:53 ` Junio C Hamano
2021-05-16 14:31 ` Wolfgang Müller
2021-05-16 21:59 ` Junio C Hamano [this message]
2021-05-17 7:19 ` Wolfgang Müller
2021-05-17 8:02 ` [PATCH v2 0/2] rev-parse: Fix segfault and translate messages Wolfgang Müller
2021-05-17 8:02 ` [PATCH v2 1/2] rev-parse: fix segfault with missing --path-format argument Wolfgang Müller
2021-05-17 8:16 ` Jeff King
2021-05-19 9:52 ` Wolfgang Müller
2021-05-19 10:19 ` Wolfgang Müller
2021-05-19 14:21 ` Jeff King
2021-05-17 8:02 ` [PATCH v2 2/2] rev-parse: Mark die() messages for translation Wolfgang Müller
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=xmqqk0ny5oi1.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=wolf@oriole.systems \
/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).