From: Phillip Wood Date: Wed, 23 Mar 2022 15:59:56 GMT Subject: Re: [PATCH 1/4] reset: do not make '--quiet' disable index refresh Message-ID: <355f36d5-7153-42a4-6db8-b9ba5fcac422@gmail.com> In-Reply-To: Hi Victoria On 21/03/2022 20:34, Victoria Dye via GitGitGadget wrote: > From: Victoria Dye > > Update '--quiet' to no longer implicitly skip refreshing the index in a > mixed reset. Users now have the ability to explicitly disable refreshing the > index with the '--no-refresh' option, so they no longer need to use > '--quiet' to do so. Moreover, we explicitly remove the refresh-skipping > behavior from '--quiet' because it is completely unrelated to the stated > purpose of the option: "Be quiet, only report errors." > > Signed-off-by: Victoria Dye > --- > Documentation/git-reset.txt | 5 +---- > builtin/reset.c | 7 ------- > t/t7102-reset.sh | 32 +++++--------------------------- > 3 files changed, 6 insertions(+), 38 deletions(-) > > diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt > index 89ddc85c2e4..bc1646c3016 100644 > --- a/Documentation/git-reset.txt > +++ b/Documentation/git-reset.txt > @@ -114,10 +114,7 @@ OPTIONS > --no-refresh:: > Proactively refresh the index after a mixed reset. If unspecified, the > behavior falls back on the `reset.refresh` config option. If neither > - `--[no-]refresh` nor `reset.refresh` are set, the default behavior is > - decided by the `--[no-]quiet` option and/or `reset.quiet` config. > - If `--quiet` is specified or `reset.quiet` is set with no command-line > - "quiet" setting, refresh is disabled. Otherwise, refresh is enabled. > + `--[no-]refresh` nor `reset.refresh` are set, refresh is enabled. > > --pathspec-from-file=:: > Pathspec is passed in `` instead of commandline args. If > diff --git a/builtin/reset.c b/builtin/reset.c > index c8a356ec5b0..7c3828f6fc5 100644 > --- a/builtin/reset.c > +++ b/builtin/reset.c > @@ -430,13 +430,6 @@ int cmd_reset(int argc, const char **argv, const char *prefix) > PARSE_OPT_KEEP_DASHDASH); > parse_args(&pathspec, argv, prefix, patch_mode, &rev); > > - /* > - * If refresh is completely unspecified (either by config or by command > - * line option), decide based on 'quiet'. > - */ > - if (refresh < 0) > - refresh = !quiet; Does this mean we can stop initializing refresh to -1? Best Wishes Phillip