diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2019-06-18 20:25:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-21 16:38:29 (GMT) |
| commit | 377444b440eab3b6ef636df092f7f8299acf75bb (patch) | |
| tree | a38c9411648d6cbb3aac25859c30d3a206290275 /advice.c | |
| parent | cdbd70c43773d534aa81ea2c83905a45ff0e74e4 (diff) | |
| download | git-377444b440eab3b6ef636df092f7f8299acf75bb.zip git-377444b440eab3b6ef636df092f7f8299acf75bb.tar.gz git-377444b440eab3b6ef636df092f7f8299acf75bb.tar.bz2 | |
fetch: warn about forced updates in branch listing
The --[no-]show-forced-updates option in 'git fetch' can be confusing
for some users, especially if it is enabled via config setting and not
by argument. Add advice to warn the user that the (forced update)
messages were not listed.
Additionally, warn users when the forced update check takes longer
than ten seconds, and recommend that they disable the check. These
messages can be disabled by the advice.fetchShowForcedUpdates config
setting.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'advice.c')
| -rw-r--r-- | advice.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -3,6 +3,7 @@ #include "color.h" #include "help.h" +int advice_fetch_show_forced_updates = 1; int advice_push_update_rejected = 1; int advice_push_non_ff_current = 1; int advice_push_non_ff_matching = 1; @@ -59,6 +60,7 @@ static struct { const char *name; int *preference; } advice_config[] = { + { "fetchShowForcedUpdates", &advice_fetch_show_forced_updates }, { "pushUpdateRejected", &advice_push_update_rejected }, { "pushNonFFCurrent", &advice_push_non_ff_current }, { "pushNonFFMatching", &advice_push_non_ff_matching }, |