зеркало из https://github.com/microsoft/git.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 <robert@coup.net.nz> Reviewed-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
eff40457a4
Коммит
2826ffad8c
|
@ -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)
|
||||
|
|
|
@ -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 \
|
||||
|
|
Загрузка…
Ссылка в новой задаче