From: Robert Coup Date: Fri, 28 Jan 2022 14:36:02 +0000 (+0000) Subject: fetch: fix negotiate-only error message X-Git-Tag: v2.36.0-rc0~161^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2826ffad8c34b639fd41f62fac1236e36e9d83db;p=thirdparty%2Fgit.git fetch: fix negotiate-only error message 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 Reviewed-by: Jonathan Tan Signed-off-by: Junio C Hamano --- diff --git a/builtin/fetch.c b/builtin/fetch.c index 3f3fa0859f..c480db32ce 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -1991,7 +1991,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 78de1ff2ad..66a16d4ab7 100755 --- a/t/t5702-protocol-v2.sh +++ b/t/t5702-protocol-v2.sh @@ -606,7 +606,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 \