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 <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Victoria Dye committed
Mar 15, 2022 at 01:49 UTC
d492abb0ae4a00c5647189b22f7c130fb364e700
1 file changed
+1
-1
builtin/reset.c
+1
-1
@@ -535,7 +535,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
535
refresh_index(&the_index, flags, NULL, NULL,
536
_("Unstaged changes after reset:"));
537
t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
538
- if (advice_enabled(ADVICE_RESET_NO_REFRESH_WARNING) && t_delta_in_ms > REFRESH_INDEX_DELAY_WARNING_IN_MS) {
538
+ if (!quiet && advice_enabled(ADVICE_RESET_NO_REFRESH_WARNING) && t_delta_in_ms > REFRESH_INDEX_DELAY_WARNING_IN_MS) {
539
advise(_("It took %.2f seconds to refresh the index after reset. You can use\n"
540
"'--no-refresh' to avoid this. Set the config setting reset.refresh to false\n"
541
"to make this the default."), t_delta_in_ms / 1000.0);