summaryrefslogtreecommitdiffstats
path: root/advice.c
diff options
context:
space:
mode:
authorBen Peart <benpeart@microsoft.com>2018-10-23 15:04:23 -0400
committerJunio C Hamano <gitster@pobox.com>2018-10-24 11:57:08 +0900
commit649bf3a42f344e71b1b5a7f562576f911a1f7423 (patch)
treec5559a7735da4ad4c8562dbf6234c891929bdfa8 /advice.c
parent4c3abd0551d8ff1c280de2bc53d6a7657b053d33 (diff)
downloadgit-649bf3a42f344e71b1b5a7f562576f911a1f7423.tar.gz
git-649bf3a42f344e71b1b5a7f562576f911a1f7423.tar.xz
reset: warn when refresh_index() takes more than 2 seconds
refresh_index() is done after a reset command as an optimization. Because it can be an expensive call, warn the user if it takes more than 2 seconds and tell them how to avoid it using the --quiet command line option or reset.quiet config setting. Signed-off-by: Ben Peart <benpeart@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'advice.c')
-rw-r--r--advice.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/advice.c b/advice.c
index 3561cd64e..5f3565640 100644
--- a/advice.c
+++ b/advice.c
@@ -12,6 +12,7 @@ int advice_push_needs_force = 1;
int advice_status_hints = 1;
int advice_status_u_option = 1;
int advice_commit_before_merge = 1;
+int advice_reset_quiet_warning = 1;
int advice_resolve_conflict = 1;
int advice_implicit_identity = 1;
int advice_detached_head = 1;
@@ -65,6 +66,7 @@ static struct {
{ "statusHints", &advice_status_hints },
{ "statusUoption", &advice_status_u_option },
{ "commitBeforeMerge", &advice_commit_before_merge },
+ { "resetQuiet", &advice_reset_quiet_warning },
{ "resolveConflict", &advice_resolve_conflict },
{ "implicitIdentity", &advice_implicit_identity },
{ "detachedHead", &advice_detached_head },