summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShuyu Wei <wsy@dogben.com>2017-11-19 19:01:32 +0800
committerJunio C Hamano <gitster@pobox.com>2017-11-21 09:53:48 +0900
commitffb4568afed7c3eaa20b000683bb82a761d8f717 (patch)
treee0b6dd300310b2507b2096dcf4b020e0dddb8c82
parent42e6fde5c28150206956ea4be490d886c4ecbd68 (diff)
downloadgit-ffb4568afed7c3eaa20b000683bb82a761d8f717.tar.gz
pull: pass -4/-6 option to 'git fetch'sw/pull-ipv46-passthru
The -4/-6 option should be passed through to 'git fetch' to be consistent with the man page. Signed-off-by: Wei Shuyu <wsy@dogben.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/pull.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c
index 42f0560252..ef22659a5c 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -109,6 +109,8 @@ static char *opt_depth;
static char *opt_unshallow;
static char *opt_update_shallow;
static char *opt_refmap;
+static char *opt_ipv4;
+static char *opt_ipv6;
static struct option pull_options[] = {
/* Shared options */
@@ -211,6 +213,12 @@ static struct option pull_options[] = {
OPT_PASSTHRU(0, "refmap", &opt_refmap, N_("refmap"),
N_("specify fetch refmap"),
PARSE_OPT_NONEG),
+ OPT_PASSTHRU('4', "ipv4", &opt_ipv4, NULL,
+ N_("use IPv4 addresses only"),
+ PARSE_OPT_NOARG),
+ OPT_PASSTHRU('6', "ipv6", &opt_ipv6, NULL,
+ N_("use IPv6 addresses only"),
+ PARSE_OPT_NOARG),
OPT_END()
};
@@ -500,6 +508,10 @@ static int run_fetch(const char *repo, const char **refspecs)
argv_array_push(&args, opt_update_shallow);
if (opt_refmap)
argv_array_push(&args, opt_refmap);
+ if (opt_ipv4)
+ argv_array_push(&args, opt_ipv4);
+ if (opt_ipv6)
+ argv_array_push(&args, opt_ipv6);
if (repo) {
argv_array_push(&args, repo);