From: "Jean-Noël AVILA" <jn.avila@free.fr>
To: git@vger.kernel.org, Robert Coup <robert@coup.net.nz>
Cc: Robert Coup <robert@coup.net.nz>
Subject: Re: [PATCH] fetch: fix negotiate-only error message
Date: Sat, 05 Feb 2022 13:29:59 +0100 [thread overview]
Message-ID: <3251849.E01RNdcrvH@cayenne> (raw)
In-Reply-To: <20220128143602.31842-1-robert@coup.net.nz>
Le vendredi 28 janvier 2022, 15:36:02 CET Robert Coup a écrit :
> The error message when invoking a negotiate-only fetch without providing
> any tips incorrectly refers to a --negotiate-tip=* argument. Fix this to
> use the actual argument, --negotiation-tip=*.
>
> Signed-off-by: Robert Coup <robert@coup.net.nz>
> ---
> builtin/fetch.c | 2 +-
> t/t5702-protocol-v2.sh | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/fetch.c b/builtin/fetch.c
> index 5f06b21f8e..af689a72a8 100644
> --- a/builtin/fetch.c
> +++ b/builtin/fetch.c
> @@ -2029,7 +2029,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
> }
>
> if (negotiate_only && !negotiation_tip.nr)
> - die(_("--negotiate-only needs one or more --negotiate-tip=*"));
> + die(_("--negotiate-only needs one or more --negotiation-tip=*"));
>
Couldn't this message be changed to
die(_("the option '%s' requires '%s'"), "--negotiate-only", "--negotiate-tip")
> if (deepen_relative) {
> if (deepen_relative < 0)
> diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
> index 710f33e2aa..59a49cede7 100755
> --- a/t/t5702-protocol-v2.sh
> +++ b/t/t5702-protocol-v2.sh
> @@ -619,7 +619,7 @@ test_expect_success 'usage: --negotiate-only without --negotiation-tip' '
> setup_negotiate_only "$SERVER" "$URI" &&
>
> cat >err.expect <<-\EOF &&
> - fatal: --negotiate-only needs one or more --negotiate-tip=*
> + fatal: --negotiate-only needs one or more --negotiation-tip=*
> EOF
>
> test_must_fail git -c protocol.version=2 -C client fetch \
>
prev parent reply other threads:[~2022-02-05 12:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-28 14:36 [PATCH] fetch: fix negotiate-only error message Robert Coup
2022-01-28 17:42 ` Jonathan Tan
2022-02-05 12:29 ` Jean-Noël AVILA [this message]
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=3251849.E01RNdcrvH@cayenne \
--to=jn.avila@free.fr \
--cc=git@vger.kernel.org \
--cc=robert@coup.net.nz \
/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).