mirror of
https://github.com/git/git
synced 2024-10-06 00:29:28 +00:00
reset: remove 'reset.quiet' config option
Remove the 'reset.quiet' config option, remove '--no-quiet' documentation in
'Documentation/git-reset.txt'. In 4c3abd0551
(reset: add new reset.quiet
config setting, 2018-10-23), 'reset.quiet' was introduced as a way to
globally change the default behavior of 'git reset --mixed' to skip index
refresh.
However, now that '--quiet' does not affect index refresh, 'reset.quiet'
would only serve to globally silence logging. This was not the original
intention of the config setting, and there's no precedent for such a setting
in other commands with a '--quiet' option, so it appears to be obsolete.
In addition to the options & its documentation, remove 'reset.quiet' from
the recommended config for 'scalar'.
Signed-off-by: Victoria Dye <vdye@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
45bf76284b
commit
2efc9b84e5
|
@ -495,8 +495,6 @@ include::config/repack.txt[]
|
|||
|
||||
include::config/rerere.txt[]
|
||||
|
||||
include::config/reset.txt[]
|
||||
|
||||
include::config/sendemail.txt[]
|
||||
|
||||
include::config/sequencer.txt[]
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
reset.quiet::
|
||||
When set to true, 'git reset' will default to the '--quiet' option.
|
|
@ -105,10 +105,7 @@ OPTIONS
|
|||
|
||||
-q::
|
||||
--quiet::
|
||||
--no-quiet::
|
||||
Be quiet, only report errors. The default behavior is set by the
|
||||
`reset.quiet` config option. `--quiet` and `--no-quiet` will
|
||||
override the default behavior.
|
||||
Be quiet, only report errors.
|
||||
|
||||
--refresh::
|
||||
--no-refresh::
|
||||
|
|
|
@ -423,7 +423,6 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
|
|||
};
|
||||
|
||||
git_config(git_reset_config, NULL);
|
||||
git_config_get_bool("reset.quiet", &quiet);
|
||||
git_config_get_bool("reset.refresh", &refresh);
|
||||
|
||||
argc = parse_options(argc, argv, prefix, options, git_reset_usage,
|
||||
|
|
|
@ -152,7 +152,6 @@ static int set_recommended_config(int reconfigure)
|
|||
{ "pack.useBitmaps", "false", 1 },
|
||||
{ "pack.useSparse", "true", 1 },
|
||||
{ "receive.autoGC", "false", 1 },
|
||||
{ "reset.quiet", "true", 1 },
|
||||
{ "feature.manyFiles", "false", 1 },
|
||||
{ "feature.experimental", "false", 1 },
|
||||
{ "fetch.unpackLimit", "1", 1 },
|
||||
|
|
|
@ -488,8 +488,7 @@ test_expect_success '--mixed refreshes the index' '
|
|||
# Verify default behavior (without --[no-]refresh or reset.refresh)
|
||||
test_reset_refreshes_index &&
|
||||
|
||||
# With --quiet & reset.quiet
|
||||
test_reset_refreshes_index "-c reset.quiet=true" &&
|
||||
# With --quiet
|
||||
test_reset_refreshes_index "" --quiet
|
||||
'
|
||||
|
||||
|
|
Loading…
Reference in a new issue