Skip to content

Commit 2efc9b8

Browse files
vdyegitster
authored andcommitted
reset: remove 'reset.quiet' config option
Remove the 'reset.quiet' config option, remove '--no-quiet' documentation in 'Documentation/git-reset.txt'. In 4c3abd0 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 45bf762 commit 2efc9b8

File tree

6 files changed

+2
-12
lines changed

6 files changed

+2
-12
lines changed

Documentation/config.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,6 @@ include::config/repack.txt[]
495495

496496
include::config/rerere.txt[]
497497

498-
include::config/reset.txt[]
499-
500498
include::config/sendemail.txt[]
501499

502500
include::config/sequencer.txt[]

Documentation/config/reset.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

Documentation/git-reset.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,7 @@ OPTIONS
105105

106106
-q::
107107
--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.
112109

113110
--refresh::
114111
--no-refresh::

builtin/reset.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,6 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
423423
};
424424

425425
git_config(git_reset_config, NULL);
426-
git_config_get_bool("reset.quiet", &quiet);
427426
git_config_get_bool("reset.refresh", &refresh);
428427

429428
argc = parse_options(argc, argv, prefix, options, git_reset_usage,

contrib/scalar/scalar.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ static int set_recommended_config(int reconfigure)
152152
{ "pack.useBitmaps", "false", 1 },
153153
{ "pack.useSparse", "true", 1 },
154154
{ "receive.autoGC", "false", 1 },
155-
{ "reset.quiet", "true", 1 },
156155
{ "feature.manyFiles", "false", 1 },
157156
{ "feature.experimental", "false", 1 },
158157
{ "fetch.unpackLimit", "1", 1 },

t/t7102-reset.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,8 +488,7 @@ test_expect_success '--mixed refreshes the index' '
488488
# Verify default behavior (without --[no-]refresh or reset.refresh)
489489
test_reset_refreshes_index &&
490490
491-
# With --quiet & reset.quiet
492-
test_reset_refreshes_index "-c reset.quiet=true" &&
491+
# With --quiet
493492
test_reset_refreshes_index "" --quiet
494493
'
495494

0 commit comments

Comments
 (0)