diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:09:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-06 09:09:00 -0800 |
| commit | 0114a7ad0664358f6f29b44461148f621520ed97 (patch) | |
| tree | 0713f43ee9d5f6c8a7e791c631a34535631d87a2 | |
| parent | Merge branch 'bc/submitting-patches-in-asciidoc' into maint (diff) | |
| parent | pull: pass -4/-6 option to 'git fetch' (diff) | |
| download | tgif-0114a7ad0664358f6f29b44461148f621520ed97.tar.xz | |
Merge branch 'sw/pull-ipv46-passthru' into maint
Contrary to the documentation, "git pull -4/-6 other-args" did not
ask the underlying "git fetch" to go over IPv4/IPv6, which has been
corrected.
* sw/pull-ipv46-passthru:
pull: pass -4/-6 option to 'git fetch'
| -rw-r--r-- | builtin/pull.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 4edab228eb..1b4d9cd974 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -112,6 +112,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 */ @@ -214,6 +216,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() }; @@ -518,6 +526,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); |