diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-11 16:55:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-11 16:55:59 -0800 |
| commit | b855f5045ead55cad7b9865ed5df6b6029aa9bdf (patch) | |
| tree | 1333255d8ce1f8970b96e54f5faee5ddc9e833f4 | |
| parent | Merge branch 'jc/doc-log-messages' (diff) | |
| parent | fetch: fix negotiate-only error message (diff) | |
| download | git-b855f5045ead55cad7b9865ed5df6b6029aa9bdf.tar.gz git-b855f5045ead55cad7b9865ed5df6b6029aa9bdf.zip | |
Merge branch 'rc/negotiate-only-typofix'
Typofix.
* rc/negotiate-only-typofix:
fetch: fix negotiate-only error message
| -rw-r--r-- | builtin/fetch.c | 2 | ||||
| -rwxr-xr-x | t/t5702-protocol-v2.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 5b3b18a72f..55d2568b18 100644 --- 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 index 900254947f..00ce9aec23 100755 --- 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 \ |