* [PATCH] fetch: fix negotiate-only error message
@ 2022-01-28 14:36 Robert Coup
2022-01-28 17:42 ` Jonathan Tan
2022-02-05 12:29 ` Jean-Noël AVILA
0 siblings, 2 replies; 3+ messages in thread
From: Robert Coup @ 2022-01-28 14:36 UTC (permalink / raw)
To: git; +Cc: Robert Coup
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=*"));
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] fetch: fix negotiate-only error message
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
1 sibling, 0 replies; 3+ messages in thread
From: Jonathan Tan @ 2022-01-28 17:42 UTC (permalink / raw)
To: robert; +Cc: git, Jonathan Tan
Robert Coup <robert@coup.net.nz> 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 <jonathantanmy@google.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] fetch: fix negotiate-only error message
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
1 sibling, 0 replies; 3+ messages in thread
From: Jean-Noël AVILA @ 2022-02-05 12:29 UTC (permalink / raw)
To: git, Robert Coup; +Cc: Robert Coup
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 \
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-05 12:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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).