mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-10 16:36:10 +02:00
Code

reset: replace '--quiet' with '--no-refresh' in performance advice 

Replace references to '--quiet' with '--no-refresh' in the advice on how to
skip refreshing the index. When the advice was introduced, '--quiet' was the
only way to avoid the expensive 'refresh_index(...)' at the end of a mixed
reset. After introducing '--no-refresh', however, '--quiet' became only a
fallback option for determining refresh behavior, overridden by
'--[no-]refresh' or 'reset.refresh' if either is set. To ensure users are
advised to use the most reliable option for avoiding 'refresh_index(...)',
replace recommendation of '--quiet' with '--[no-]refresh'.

Signed-off-by: Victoria Dye <vdye@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Victoria Dye 2022-03-15 01:49:40 +00:00 committed by Junio C Hamano
parent fd56fba97f
commit 9396251b37
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/config/advice.txt
View File

@ -67,10 +67,10 @@ advice.*::
commitBeforeMerge:: commitBeforeMerge::
Advice shown when linkgit:git-merge[1] refuses to Advice shown when linkgit:git-merge[1] refuses to
merge to avoid overwriting local changes. merge to avoid overwriting local changes.
resetQuiet:: resetNoRefresh::
Advice to consider using the `--quiet` option to linkgit:git-reset[1] Advice to consider using the `--no-refresh` option to
when the command takes more than 2 seconds to refresh the index linkgit:git-reset[1] when the command takes more than 2 seconds
after reset. to refresh the index after reset.
resolveConflict:: resolveConflict::
Advice shown by various commands when conflicts Advice shown by various commands when conflicts
prevent the operation from being performed. prevent the operation from being performed.

2
advice.c
View File

@ -61,7 +61,7 @@ static struct {
[ADVICE_PUSH_NON_FF_MATCHING] = { "pushNonFFMatching", 1 }, [ADVICE_PUSH_NON_FF_MATCHING] = { "pushNonFFMatching", 1 },
[ADVICE_PUSH_UNQUALIFIED_REF_NAME] = { "pushUnqualifiedRefName", 1 }, [ADVICE_PUSH_UNQUALIFIED_REF_NAME] = { "pushUnqualifiedRefName", 1 },
[ADVICE_PUSH_UPDATE_REJECTED] = { "pushUpdateRejected", 1 }, [ADVICE_PUSH_UPDATE_REJECTED] = { "pushUpdateRejected", 1 },
[ADVICE_RESET_QUIET_WARNING] = { "resetQuiet", 1 }, [ADVICE_RESET_NO_REFRESH_WARNING] = { "resetNoRefresh", 1 },
[ADVICE_RESOLVE_CONFLICT] = { "resolveConflict", 1 }, [ADVICE_RESOLVE_CONFLICT] = { "resolveConflict", 1 },
[ADVICE_RM_HINTS] = { "rmHints", 1 }, [ADVICE_RM_HINTS] = { "rmHints", 1 },
[ADVICE_SEQUENCER_IN_USE] = { "sequencerInUse", 1 }, [ADVICE_SEQUENCER_IN_USE] = { "sequencerInUse", 1 },

2
advice.h
View File

@ -36,7 +36,7 @@ struct string_list;
ADVICE_PUSH_UPDATE_REJECTED_ALIAS, ADVICE_PUSH_UPDATE_REJECTED_ALIAS,
ADVICE_PUSH_UPDATE_REJECTED, ADVICE_PUSH_UPDATE_REJECTED,
ADVICE_PUSH_REF_NEEDS_UPDATE, ADVICE_PUSH_REF_NEEDS_UPDATE,
ADVICE_RESET_QUIET_WARNING, ADVICE_RESET_NO_REFRESH_WARNING,
ADVICE_RESOLVE_CONFLICT, ADVICE_RESOLVE_CONFLICT,
ADVICE_RM_HINTS, ADVICE_RM_HINTS,
ADVICE_SEQUENCER_IN_USE, ADVICE_SEQUENCER_IN_USE,

8
builtin/reset.c
View File

@ -535,10 +535,10 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
refresh_index(&the_index, flags, NULL, NULL, refresh_index(&the_index, flags, NULL, NULL,
_("Unstaged changes after reset:")); _("Unstaged changes after reset:"));
t_delta_in_ms = (getnanotime() - t_begin) / 1000000; t_delta_in_ms = (getnanotime() - t_begin) / 1000000;
if (advice_enabled(ADVICE_RESET_QUIET_WARNING) && t_delta_in_ms > REFRESH_INDEX_DELAY_WARNING_IN_MS) { if (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\n" advise(_("It took %.2f seconds to refresh the index after reset. You can use\n"
"use '--quiet' to avoid this. Set the config setting reset.quiet to true\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); "to make this the default."), t_delta_in_ms / 1000.0);
} }
} }
} else { } else {