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

pull: add --[no-]show-forced-updates passthrough

Browse Source 
The 'git fetch' command can avoid calculating forced updates, so
allow users of 'git pull' to provide that option. This is particularly
necessary when the advice to use '--no-show-forced-updates' is given
at the end of the command.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee 2019-06-18 13:25:28 -07:00 committed by Junio C Hamano
parent 377444b440
commit 3883c55138
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/pull.c
View File

@ -128,6 +128,7 @@ static char *opt_update_shallow;
static char *opt_refmap; static char *opt_refmap;
static char *opt_ipv4; static char *opt_ipv4;
static char *opt_ipv6; static char *opt_ipv6;
static int opt_show_forced_updates = -1;
static struct option pull_options[] = { static struct option pull_options[] = {
/* Shared options */ /* Shared options */
@ -240,6 +241,8 @@ static struct option pull_options[] = {
OPT_PASSTHRU('6', "ipv6", &opt_ipv6, NULL, OPT_PASSTHRU('6', "ipv6", &opt_ipv6, NULL,
N_("use IPv6 addresses only"), N_("use IPv6 addresses only"),
PARSE_OPT_NOARG), PARSE_OPT_NOARG),
OPT_BOOL(0, "show-forced-updates", &opt_show_forced_updates,
N_("check for forced-updates on all updated branches")),
OPT_END() OPT_END()
}; };
@ -549,6 +552,10 @@ static int run_fetch(const char *repo, const char **refspecs)
argv_array_push(&args, opt_ipv4); argv_array_push(&args, opt_ipv4);
if (opt_ipv6) if (opt_ipv6)
argv_array_push(&args, opt_ipv6); argv_array_push(&args, opt_ipv6);
if (opt_show_forced_updates > 0)
argv_array_push(&args, "--show-forced-updates");
else if (opt_show_forced_updates == 0)
argv_array_push(&args, "--no-show-forced-updates");
if (repo) { if (repo) {
argv_array_push(&args, repo); argv_array_push(&args, repo);