From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jul 2019 22:25:46 +0000 (-0700)
Subject: Merge branch 'ds/fetch-disable-force-notice'
X-Git-Tag: v2.23.0-rc0~54
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cde9a64ea35ceeaa5e8dd2da2662445510fe651c

Merge branch 'ds/fetch-disable-force-notice'

"git fetch" and "git pull" reports when a fetch results in
non-fast-forward updates to let the user notice unusual situation.
The commands learned "--no-shown-forced-updates" option to disable
this safety feature.

* ds/fetch-disable-force-notice:
pull: add --[no-]show-forced-updates passthrough
fetch: warn about forced updates in branch listing
fetch: add --[no-]show-forced-updates argument
---

cde9a64ea35ceeaa5e8dd2da2662445510fe651c
diff --cc builtin/fetch.c
index 667f2cec7b,cf7eb0dd8d..53ce99d2bb
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -170,8 -178,8 +179,10 @@@ static struct option builtin_fetch_opti
  	OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"),
  			N_("report that we have only objects reachable from this object")),
  	OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
 +	OPT_BOOL(0, "auto-gc", &enable_auto_gc,
 +		 N_("run 'gc --auto' after fetching")),
+ 	OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates,
+ 		 N_("check for forced-updates on all updated branches")),
  	OPT_END()
  };