Skip to content

Commit b855f50

Browse files
committed
Merge branch 'rc/negotiate-only-typofix'
Typofix. * rc/negotiate-only-typofix: fetch: fix negotiate-only error message
2 parents 8376093 + 2826ffa commit b855f50

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

builtin/fetch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2052,7 +2052,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
20522052
}
20532053

20542054
if (negotiate_only && !negotiation_tip.nr)
2055-
die(_("--negotiate-only needs one or more --negotiate-tip=*"));
2055+
die(_("--negotiate-only needs one or more --negotiation-tip=*"));
20562056

20572057
if (deepen_relative) {
20582058
if (deepen_relative < 0)

t/t5702-protocol-v2.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ test_expect_success 'usage: --negotiate-only without --negotiation-tip' '
619619
setup_negotiate_only "$SERVER" "$URI" &&
620620
621621
cat >err.expect <<-\EOF &&
622-
fatal: --negotiate-only needs one or more --negotiate-tip=*
622+
fatal: --negotiate-only needs one or more --negotiation-tip=*
623623
EOF
624624
625625
test_must_fail git -c protocol.version=2 -C client fetch \

0 commit comments

Comments
 (0)