From: Alex Henrie <alexhenrie24@gmail.com>
To: Alexander Shopov <ash@kambanaria.org>
Cc: git@vger.kernel.org, gitster@pobox.com, worldhello.net@gmail.com
Subject: Re: [Improvements on messages 1/5] rebase: trivial fix of error message
Date: Fri, 16 Feb 2024 12:05:16 -0700 [thread overview]
Message-ID: <CAMMLpeS-Q7drd0rHnpMEkuomUGOr0iJi3FGFWihA=oFbdZ=Duw@mail.gmail.com> (raw)
In-Reply-To: <20240216101647.28837-2-ash@kambanaria.org>
On Fri, Feb 16, 2024 at 3:16 AM Alexander Shopov <ash@kambanaria.org> wrote:
>
> Mark --rebase-merges as option rather than variable name
>
> Signed-off-by: Alexander Shopov <ash@kambanaria.org>
> ---
> builtin/rebase.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/builtin/rebase.c b/builtin/rebase.c
> index 4084a6abb8..9c6d971515 100644
> --- a/builtin/rebase.c
> +++ b/builtin/rebase.c
> @@ -746,7 +746,7 @@ static void parse_rebase_merges_value(struct rebase_options *options, const char
> else if (!strcmp("rebase-cousins", value))
> options->rebase_cousins = 1;
> else
> - die(_("Unknown rebase-merges mode: %s"), value);
> + die(_("Unknown --rebase-merges mode: %s"), value);
Hi Alexander! The other patches in this series look good to me, but I
don't think this one is right. This error message could be about
either the --rebase-merges command line option or the
rebase.rebaseMerges config option. The word "rebase-merges" is
intentionally ambiguous enough to cover both situations and was not
intended to be left in English in translations.
-Alex
next prev parent reply other threads:[~2024-02-16 19:05 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-16 10:15 [Improvements on messages 0/5] Disambuiguate between options and commands Alexander Shopov
2024-02-16 10:15 ` [Improvements on messages 1/5] rebase: trivial fix of error message Alexander Shopov
2024-02-16 19:05 ` Alex Henrie [this message]
2024-02-16 10:15 ` [Improvements on messages 2/5] transport-helper.c: " Alexander Shopov
2024-02-16 10:15 ` [Improvements on messages 3/5] builtin/remote.c: " Alexander Shopov
2024-02-16 10:15 ` [Improvements on messages 4/5] builtin/clone.c: trivial fix of message Alexander Shopov
2024-02-16 10:15 ` [Improvements on messages 5/5] revision.c: trivial fix to message Alexander Shopov
2024-02-16 18:43 ` [Improvements on messages 0/5] Disambuiguate between options and commands Junio C Hamano
2024-03-05 22:05 ` 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='CAMMLpeS-Q7drd0rHnpMEkuomUGOr0iJi3FGFWihA=oFbdZ=Duw@mail.gmail.com' \
--to=alexhenrie24@gmail.com \
--cc=ash@kambanaria.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=worldhello.net@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.
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).