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@xxxxxxxxx>
Acked-by: Stefan Beller <sbeller@xxxxxxxxxx>
---
As before, just rebased.
connect.c | 25 ++++++++++++++++++++++---
t/t5601-clone.sh | 12 ++++++------
2 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/connect.c b/connect.c
index 0441dcbacf..9c64e8155a 100644
--- a/connect.c
+++ b/connect.c
@@ -923,11 +923,30 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env,
get_protocol_version_config());
}
- if (variant != VARIANT_SIMPLE) {
- if (flags & CONNECT_IPV4)
+ if (flags & CONNECT_IPV4) {
+ switch (variant) {
+ case VARIANT_AUTO:
+ BUG("VARIANT_AUTO passed to push_ssh_options");
+ case VARIANT_SIMPLE:
+ die("ssh variant 'simple' does not support -4");
+ case VARIANT_SSH:
+ case VARIANT_PLINK:
+ case VARIANT_PUTTY:
+ case VARIANT_TORTOISEPLINK:
argv_array_push(args, "-4");
- else if (flags & CONNECT_IPV6)
+ }
+ } else if (flags & CONNECT_IPV6) {
+ switch (variant) {
+ case VARIANT_AUTO:
+ BUG("VARIANT_AUTO passed to push_ssh_options");
+ case VARIANT_SIMPLE:
+ die("ssh variant 'simple' does not support -6");
+ case VARIANT_SSH:
+ case VARIANT_PLINK:
+ case VARIANT_PUTTY:
+ case VARIANT_TORTOISEPLINK:
argv_array_push(args, "-6");
+ }
}
if (variant == VARIANT_TORTOISEPLINK)
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index df9dfafdd8..ea401cec1f 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -367,9 +367,10 @@ test_expect_success 'OpenSSH variant passes -4' '
expect_ssh "-4 -p 123" myhost src
'
-test_expect_success 'variant can be overriden' '
- git -c ssh.variant=simple clone -4 "[myhost:123]:src" ssh-simple-clone &&
- expect_ssh myhost src
+test_expect_success 'variant can be overridden' '
+ copy_ssh_wrapper_as "$TRASH_DIRECTORY/putty" &&
+ git -c ssh.variant=putty clone -4 "[myhost:123]:src" ssh-putty-clone &&
+ expect_ssh "-4 -P 123" myhost src
'
test_expect_success 'variant=auto picks based on basename' '
@@ -378,10 +379,9 @@ test_expect_success 'variant=auto picks based on basename' '
expect_ssh "-4 -P 123" myhost src
'
-test_expect_success 'simple is treated as simple' '
+test_expect_success 'simple does not support -4/-6' '
copy_ssh_wrapper_as "$TRASH_DIRECTORY/simple" &&
- git clone -4 "[myhost:123]:src" ssh-bracket-clone-simple &&
- expect_ssh myhost src
+ test_must_fail git clone -4 "[myhost:123]:src" ssh-bracket-clone-simple
'
test_expect_success 'uplink is treated as simple' '
--
2.15.0.rc1.287.g2b38de12cc
