@matheusbsbs / matheus-bagliano / commits / 2efc9b84e5

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>

Victoria Dye committed Mar 23, 2022 at 18:17 UTC 2efc9b84e5e9ea063ecfb2f813cb56653a03c10a
6 files changed +2 -12
Documentation/config.txt
-2
@@ -495,8 +495,6 @@ include::config/repack.txt[]
495
496 include::config/rerere.txt[]
497
498 -include::config/reset.txt[]
499 -
498 include::config/sendemail.txt[]
499
500 include::config/sequencer.txt[]
Documentation/config/reset.txt deleted
-2
@@ -1,2 +0,0 @@
1 -reset.quiet::
2 - When set to true, 'git reset' will default to the '--quiet' option.
Documentation/git-reset.txt
+1 -4
@@ -105,10 +105,7 @@ OPTIONS
105
106 -q::
107 --quiet::
108 ---no-quiet::
109 - Be quiet, only report errors. The default behavior is set by the
110 - `reset.quiet` config option. `--quiet` and `--no-quiet` will
111 - override the default behavior.
108 + Be quiet, only report errors.
109
110 --refresh::
111 --no-refresh::
builtin/reset.c
-1
@@ -423,7 +423,6 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
423 };
424
425 git_config(git_reset_config, NULL);
426 - git_config_get_bool("reset.quiet", &quiet);
426 git_config_get_bool("reset.refresh", &refresh);
427
428 argc = parse_options(argc, argv, prefix, options, git_reset_usage,
contrib/scalar/scalar.c
-1
@@ -152,7 +152,6 @@ static int set_recommended_config(int reconfigure)
152 { "pack.useBitmaps", "false", 1 },
153 { "pack.useSparse", "true", 1 },
154 { "receive.autoGC", "false", 1 },
155 - { "reset.quiet", "true", 1 },
155 { "feature.manyFiles", "false", 1 },
156 { "feature.experimental", "false", 1 },
157 { "fetch.unpackLimit", "1", 1 },
t/t7102-reset.sh
+1 -2
@@ -488,8 +488,7 @@ test_expect_success '--mixed refreshes the index' '
488 # Verify default behavior (without --[no-]refresh or reset.refresh)
489 test_reset_refreshes_index &&
490
491 - # With --quiet & reset.quiet
492 - test_reset_refreshes_index "-c reset.quiet=true" &&
491 + # With --quiet
492 test_reset_refreshes_index "" --quiet
493 '
494