ssh: 'simple' variant does not support -4/-6
If the user passes -4/--ipv4 or -6/--ipv6 to "git fetch" or "git push" and the ssh command configured with GIT_SSH does not support such a setting, error out instead of ignoring the option and continuing. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Nov 20, 2017 at 13:30 UTC
a3f5b66fac3b5f3b2c352c8086dbc3d476f9e3d4
2 files changed
+28
-9
connect.c
+22
-3
@@ -938,11 +938,30 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env,
938
get_protocol_version_config());
939
}
940
941
- if (variant != VARIANT_SIMPLE) {
942
- if (flags & CONNECT_IPV4)
941
+ if (flags & CONNECT_IPV4) {
942
+ switch (variant) {
943
+ case VARIANT_AUTO:
944
+ BUG("VARIANT_AUTO passed to push_ssh_options");
945
+ case VARIANT_SIMPLE:
946
+ die("ssh variant 'simple' does not support -4");
947
+ case VARIANT_SSH:
948
+ case VARIANT_PLINK:
949
+ case VARIANT_PUTTY:
950
+ case VARIANT_TORTOISEPLINK:
951
argv_array_push(args, "-4");
944
- else if (flags & CONNECT_IPV6)
952
+ }
953
+ } else if (flags & CONNECT_IPV6) {
954
+ switch (variant) {
955
+ case VARIANT_AUTO:
956
+ BUG("VARIANT_AUTO passed to push_ssh_options");
957
+ case VARIANT_SIMPLE:
958
+ die("ssh variant 'simple' does not support -6");
959
+ case VARIANT_SSH:
960
+ case VARIANT_PLINK:
961
+ case VARIANT_PUTTY:
962
+ case VARIANT_TORTOISEPLINK:
963
argv_array_push(args, "-6");
964
+ }
965
}
966
967
if (variant == VARIANT_TORTOISEPLINK)
t/t5601-clone.sh
+6
-6
@@ -364,9 +364,10 @@ test_expect_success 'OpenSSH variant passes -4' '
364
expect_ssh "-4 -p 123" myhost src
365
'
366
367
-test_expect_success 'variant can be overriden' '
368
- git -c ssh.variant=simple clone -4 "[myhost:123]:src" ssh-simple-clone &&
369
- expect_ssh myhost src
367
+test_expect_success 'variant can be overridden' '
368
+ copy_ssh_wrapper_as "$TRASH_DIRECTORY/putty" &&
369
+ git -c ssh.variant=putty clone -4 "[myhost:123]:src" ssh-putty-clone &&
370
+ expect_ssh "-4 -P 123" myhost src
371
'
372
373
test_expect_success 'variant=auto picks based on basename' '
@@ -375,10 +376,9 @@ test_expect_success 'variant=auto picks based on basename' '
376
expect_ssh "-4 -P 123" myhost src
377
'
378
378
-test_expect_success 'simple is treated as simple' '
379
+test_expect_success 'simple does not support -4/-6' '
380
copy_ssh_wrapper_as "$TRASH_DIRECTORY/simple" &&
380
- git clone -4 "[myhost:123]:src" ssh-bracket-clone-simple &&
381
- expect_ssh myhost src
381
+ test_must_fail git clone -4 "[myhost:123]:src" ssh-bracket-clone-simple
382
'
383
384
test_expect_success 'uplink is treated as simple' '