undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sw/pull-ipv46-passthru'

Browse Source 
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'
This commit is contained in:
Junio C Hamano 2017-11-27 11:06:40 +09:00
commit c2b6135a1b
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/pull.c
View File

@ -113,6 +113,8 @@ static char *opt_depth;
static char *opt_unshallow; static char *opt_unshallow;
static char *opt_update_shallow; static char *opt_update_shallow;
static char *opt_refmap; static char *opt_refmap;
static char *opt_ipv4;
static char *opt_ipv6;
static struct option pull_options[] = { static struct option pull_options[] = {
/* Shared options */ /* Shared options */
@ -218,6 +220,12 @@ static struct option pull_options[] = {
OPT_PASSTHRU(0, "refmap", &opt_refmap, N_("refmap"), OPT_PASSTHRU(0, "refmap", &opt_refmap, N_("refmap"),
N_("specify fetch refmap"), N_("specify fetch refmap"),
PARSE_OPT_NONEG), 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() OPT_END()
}; };
@ -522,6 +530,10 @@ static int run_fetch(const char *repo, const char **refspecs)
argv_array_push(&args, opt_update_shallow); argv_array_push(&args, opt_update_shallow);
if (opt_refmap) if (opt_refmap)
argv_array_push(&args, 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) { if (repo) {
argv_array_push(&args, repo); argv_array_push(&args, repo);