Merge branch 'rc/negotiate-only-typofix'

gitster · gitster · commit b855f5045ead · 2022-02-11T16:55:59.000-08:00
Typofix.

* rc/negotiate-only-typofix:
  fetch: fix negotiate-only error message
diff --git a/builtin/fetch.c b/builtin/fetch.c
@@ -2052,7 +2052,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
@@ -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 \

Original file line number	Diff line number	Diff line change
`@@ -2052,7 +2052,7 @@ int cmd_fetch(int argc, const char *argv, const char prefix)`
`2052`	`2052`	`}`
`2053`	`2053`
`2054`	`2054`	`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=*"));`
`2056`	`2056`
`2057`	`2057`	`if (deepen_relative) {`
`2058`	`2058`	`if (deepen_relative < 0)`