mirror of
https://github.com/git/git
synced 2024-08-24 02:11:08 +00:00
Merge branch 'rc/negotiate-only-typofix'
Typofix. * rc/negotiate-only-typofix: fetch: fix negotiate-only error message
This commit is contained in:
commit
b855f5045e
|
@ -2052,7 +2052,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (negotiate_only && !negotiation_tip.nr)
|
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) {
|
||||||
if (deepen_relative < 0)
|
if (deepen_relative < 0)
|
||||||
|
|
|
@ -619,7 +619,7 @@ test_expect_success 'usage: --negotiate-only without --negotiation-tip' '
|
||||||
setup_negotiate_only "$SERVER" "$URI" &&
|
setup_negotiate_only "$SERVER" "$URI" &&
|
||||||
|
|
||||||
cat >err.expect <<-\EOF &&
|
cat >err.expect <<-\EOF &&
|
||||||
fatal: --negotiate-only needs one or more --negotiate-tip=*
|
fatal: --negotiate-only needs one or more --negotiation-tip=*
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
test_must_fail git -c protocol.version=2 -C client fetch \
|
test_must_fail git -c protocol.version=2 -C client fetch \
|
||||||
|
|
Loading…
Reference in a new issue