1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-05 04:46:12 +02:00

fetch: reject --no-ipv[46]

Now we have introduced OPT_IPVERSION(), tweak its implementation so
that "git clone", "git fetch", and "git push" reject the negated
form of "Use only IP version N" options.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2023-07-18 14:45:59 -07:00
parent ae2c912c04
commit a2dad4868b
2 changed files with 15 additions and 4 deletions

View File

@ -582,9 +582,9 @@ int parse_opt_tracking_mode(const struct option *, const char *, int);
#define OPT_AUTOSTASH(v) OPT_BOOL(0, "autostash", v, N_("automatically stash/stash pop before and after"))
#define OPT_IPVERSION(v) \
OPT_SET_INT('4', "ipv4", (v), N_("use IPv4 addresses only"), \
TRANSPORT_FAMILY_IPV4), \
OPT_SET_INT('6', "ipv6", (v), N_("use IPv6 addresses only"), \
TRANSPORT_FAMILY_IPV6)
OPT_SET_INT_F('4', "ipv4", (v), N_("use IPv4 addresses only"), \
TRANSPORT_FAMILY_IPV4, PARSE_OPT_NONEG), \
OPT_SET_INT_F('6', "ipv6", (v), N_("use IPv6 addresses only"), \
TRANSPORT_FAMILY_IPV6, PARSE_OPT_NONEG)
#endif

View File

@ -120,6 +120,17 @@ test_expect_success setup '
'
for cmd in push fetch
do
for opt in ipv4 ipv6
do
test_expect_success "reject 'git $cmd --no-$opt'" '
test_must_fail git $cmd --no-$opt 2>err &&
grep "unknown option .no-$opt" err
'
done
done
test_expect_success 'fetch without wildcard' '
mk_empty testrepo &&
(