From: Phillip Wood <phillip.wood123@gmail.com>
To: Victoria Dye via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: gitster@pobox.com, Victoria Dye <vdye@github.com>
Subject: Re: [PATCH 1/4] reset: do not make '--quiet' disable index refresh
Date: Wed, 23 Mar 2022 15:59:56 +0000 [thread overview]
Message-ID: <355f36d5-7153-42a4-6db8-b9ba5fcac422@gmail.com> (raw)
In-Reply-To: <f89e9b4ae24718116d0275333f4ece1d4024ab6b.1647894889.git.gitgitgadget@gmail.com>
Hi Victoria
On 21/03/2022 20:34, Victoria Dye via GitGitGadget wrote:
> From: Victoria Dye <vdye@github.com>
>
> 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 <vdye@github.com>
> ---
> 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=<file>::
> Pathspec is passed in `<file>` 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
next prev parent reply other threads:[~2022-03-23 16:00 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-21 20:34 [PATCH 0/4] reset: make --no-refresh the only way to skip index refresh Victoria Dye via GitGitGadget
2022-03-21 20:34 ` [PATCH 1/4] reset: do not make '--quiet' disable " Victoria Dye via GitGitGadget
2022-03-23 15:59 ` Phillip Wood [this message]
2022-03-23 16:52 ` Victoria Dye
2022-03-21 20:34 ` [PATCH 2/4] reset: deprecate 'reset.quiet' config option Victoria Dye via GitGitGadget
2022-03-23 16:00 ` Phillip Wood
2022-03-21 20:34 ` [PATCH 3/4] reset: deprecate 'reset.refresh' " Victoria Dye via GitGitGadget
2022-03-23 16:02 ` Phillip Wood
2022-03-23 17:19 ` Victoria Dye
2022-03-21 20:34 ` [PATCH 4/4] reset: deprecate '--refresh', leaving only '--no-refresh' Victoria Dye via GitGitGadget
2022-03-23 16:02 ` Phillip Wood
2022-03-23 16:58 ` Victoria Dye
2022-03-23 18:17 ` [PATCH v2 0/3] reset: make --no-refresh the only way to skip index refresh Victoria Dye via GitGitGadget
2022-03-23 18:17 ` [PATCH v2 1/3] reset: do not make '--quiet' disable " Victoria Dye via GitGitGadget
2022-03-23 18:17 ` [PATCH v2 2/3] reset: remove 'reset.quiet' config option Victoria Dye via GitGitGadget
2022-03-23 18:18 ` [PATCH v2 3/3] reset: remove 'reset.refresh' " Victoria Dye via GitGitGadget
2022-03-23 19:26 ` [PATCH v2 0/3] reset: make --no-refresh the only way to skip index refresh Derrick Stolee
2022-03-23 21:41 ` Junio C Hamano
2022-03-24 11:11 ` Phillip Wood
2022-03-24 17:13 ` Junio C Hamano
2022-03-24 17:33 ` Junio C Hamano
2022-03-24 18:01 ` Victoria Dye
2022-03-24 20:36 ` Junio C Hamano
2022-03-25 15:04 ` Derrick Stolee
2022-03-25 16:35 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=355f36d5-7153-42a4-6db8-b9ba5fcac422@gmail.com \
--to=phillip.wood123@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=vdye@github.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).