From: Victoria Dye Date: Tue, 15 Mar 2022 01:49:41 +0000 (+0000) Subject: reset: suppress '--no-refresh' advice if logging is silenced X-Git-Tag: v2.36.0-rc0~25^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d492abb0ae4a00c5647189b22f7c130fb364e700;p=thirdparty%2Fgit.git reset: suppress '--no-refresh' advice if logging is silenced If using '--quiet' or 'reset.quiet=true', do not print the 'resetnoRefresh' advice string. For applications that rely on '--quiet' disabling all non-error logs, the advice message should be suppressed accordingly. Signed-off-by: Victoria Dye Signed-off-by: Junio C Hamano --- diff --git a/builtin/reset.c b/builtin/reset.c index feab85e03d..c8a356ec5b 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -535,7 +535,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix) refresh_index(&the_index, flags, NULL, NULL, _("Unstaged changes after reset:")); t_delta_in_ms = (getnanotime() - t_begin) / 1000000; - if (advice_enabled(ADVICE_RESET_NO_REFRESH_WARNING) && t_delta_in_ms > REFRESH_INDEX_DELAY_WARNING_IN_MS) { + if (!quiet && advice_enabled(ADVICE_RESET_NO_REFRESH_WARNING) && t_delta_in_ms > REFRESH_INDEX_DELAY_WARNING_IN_MS) { advise(_("It took %.2f seconds to refresh the index after reset. You can use\n" "'--no-refresh' to avoid this. Set the config setting reset.refresh to false\n" "to make this the default."), t_delta_in_ms / 1000.0);