On 22/10/2018 14:18, Ben Peart wrote:
> From: Ben Peart <benpeart@xxxxxxxxxxxxx>
>
> Add a reset.quiet config setting that sets the default value of the --quiet
> flag when running the reset command. This enables users to change the
> default behavior to take advantage of the performance advantages of
> avoiding the scan for unstaged changes after reset. Defaults to false.
>
> Signed-off-by: Ben Peart <benpeart@xxxxxxxxxxxxx>
> ---
> Documentation/config.txt | 3 +++
> Documentation/git-reset.txt | 4 +++-
> builtin/reset.c | 1 +
> 3 files changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index f6f4c21a54..a2d1b8b116 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -2728,6 +2728,9 @@ rerere.enabled::
> `$GIT_DIR`, e.g. if "rerere" was previously used in the
> repository.
>
> +reset.quiet::
> + When set to true, 'git reset' will default to the '--quiet' option.
> +
> include::sendemail-config.txt[]
>
> sequence.editor::
> diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
> index 1d697d9962..51a427a34a 100644
> --- a/Documentation/git-reset.txt
> +++ b/Documentation/git-reset.txt
> @@ -95,7 +95,9 @@ OPTIONS
>
> -q::
> --quiet::
> - Be quiet, only report errors.
> +--no-quiet::
> + Be quiet, only report errors. The default behavior respects the
> + `reset.quiet` config option, or `--no-quiet` if that is not set.
Sorry, I can't quite parse this; -q,--quiet and --no-quiet on the
command line (should) trump whatever rest.quiet is set to in the
configuration. Is that not the case?
ATB,
Ramsay Jones
>
>
> EXAMPLES
> diff --git a/builtin/reset.c b/builtin/reset.c
> index 04f0d9b4f5..3b43aee544 100644
> --- a/builtin/reset.c
> +++ b/builtin/reset.c
> @@ -306,6 +306,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
> };
>
> git_config(git_reset_config, NULL);
> + git_config_get_bool("reset.quiet", &quiet);
>
> argc = parse_options(argc, argv, prefix, options, git_reset_usage,
> PARSE_OPT_KEEP_DASHDASH);
>
