mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +00:00
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>
This commit is contained in:
parent
9396251b37
commit
d492abb0ae
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue