# [PATCH] fetch: fix negotiate-only error message 3 messages from 2022-01-28 to 2022-02-05. Participants: Robert Coup, Jonathan Tan, Jean-Noël AVILA. Thread: https://gitlist.dev/t/57332 ## Robert Coup, 2022-01-28 14:36 Subject: [PATCH] fetch: fix negotiate-only error message Message-ID: <20220128143602.31842-1-robert@coup.net.nz> URL: https://gitlist.dev/e/20220128143602.31842-1-robert%40coup.net.nz ``` 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 --- 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=*")); 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 \ -- 2.34.0 ``` ## Jonathan Tan, 2022-01-28 17:42 Subject: Re: [PATCH] fetch: fix negotiate-only error message Message-ID: <20220128174236.3264310-1-jonathantanmy@google.com> URL: https://gitlist.dev/e/20220128174236.3264310-1-jonathantanmy%40google.com In-Reply-To: <20220128143602.31842-1-robert@coup.net.nz> ``` Robert Coup writes: > 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=*. Ah, the argument is indeed --negotiation-tip. Thanks for the fix. Reviewed-by: Jonathan Tan ``` ## Jean-Noël AVILA, 2022-02-05 12:29 Subject: Re: [PATCH] fetch: fix negotiate-only error message Message-ID: <3251849.E01RNdcrvH@cayenne> URL: https://gitlist.dev/e/3251849.E01RNdcrvH%40cayenne 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 > --- > 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 \ > ```