summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-07-16 17:42:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-07-16 17:42:48 -0700
commitb2fc8226294e52c7f08533b202f2b90ce72b7eaf (patch)
tree49f3d074e3ef48dcdc288a4524d0fda003ec0dc5 /t
parentMerge branch 'ab/make-delete-on-error' (diff)
parentfetch: fix segfault in --negotiate-only without --negotiation-tip=* (diff)
downloadtgif-b2fc8226294e52c7f08533b202f2b90ce72b7eaf.tar.xz
Merge branch 'ab/fetch-negotiate-segv-fix'
Code recently added to support common ancestry negotiation during "git push" did not sanity check its arguments carefully enough. * ab/fetch-negotiate-segv-fix: fetch: fix segfault in --negotiate-only without --negotiation-tip=* fetch: document the --negotiate-only option send-pack.c: move "no refs in common" abort earlier
Diffstat (limited to 't')
-rwxr-xr-xt/t5702-protocol-v2.sh16
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index 66af411057..78de1ff2ad 100755
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -599,6 +599,22 @@ setup_negotiate_only () {
test_commit -C client three
}
+test_expect_success 'usage: --negotiate-only without --negotiation-tip' '
+ SERVER="server" &&
+ URI="file://$(pwd)/server" &&
+
+ setup_negotiate_only "$SERVER" "$URI" &&
+
+ cat >err.expect <<-\EOF &&
+ fatal: --negotiate-only needs one or more --negotiate-tip=*
+ EOF
+
+ test_must_fail git -c protocol.version=2 -C client fetch \
+ --negotiate-only \
+ origin 2>err.actual &&
+ test_cmp err.expect err.actual
+'
+
test_expect_success 'file:// --negotiate-only' '
SERVER="server" &&
URI="file://$(pwd)/server" &&