diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2019-06-18 13:25:28 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-06-21 09:38:29 -0700 |
| commit | 3883c55138dcfbe2d9a24e3f93a2a4b1d376dde6 (patch) | |
| tree | 65dfcd9a7b60ec6a7b8cfce202a13c4ed1a85d22 /builtin | |
| parent | fetch: warn about forced updates in branch listing (diff) | |
| download | tgif-3883c55138dcfbe2d9a24e3f93a2a4b1d376dde6.tar.xz | |
pull: add --[no-]show-forced-updates passthrough
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>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/pull.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index 9dd32a115b..f1eaf6e6ed 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -128,6 +128,7 @@ static char *opt_update_shallow; static char *opt_refmap; static char *opt_ipv4; static char *opt_ipv6; +static int opt_show_forced_updates = -1; static struct option pull_options[] = { /* Shared options */ @@ -240,6 +241,8 @@ static struct option pull_options[] = { OPT_PASSTHRU('6', "ipv6", &opt_ipv6, NULL, N_("use IPv6 addresses only"), PARSE_OPT_NOARG), + OPT_BOOL(0, "show-forced-updates", &opt_show_forced_updates, + N_("check for forced-updates on all updated branches")), OPT_END() }; @@ -549,6 +552,10 @@ static int run_fetch(const char *repo, const char **refspecs) argv_array_push(&args, opt_ipv4); if (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) { argv_array_push(&args, repo); |