From: Derrick Stolee <derrickstolee@github.com>
To: Victoria Dye via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: Victoria Dye <vdye@github.com>
Subject: Re: [PATCH 5/5] stash: make internal resets quiet and refresh index
Date: Mon, 14 Mar 2022 11:10:00 -0400 [thread overview]
Message-ID: <41db12c3-029f-2e44-703c-90cb45ed9875@github.com> (raw)
In-Reply-To: <052499bbc93cb6a60a3b7f7861de78dd4075fd7f.1647043729.git.gitgitgadget@gmail.com>
On 3/11/2022 7:08 PM, Victoria Dye via GitGitGadget wrote:
> From: Victoria Dye <vdye@github.com>
>
> Add the options '-q' and '--refresh' to the 'git reset' executed in
> 'reset_head()', and '--refresh' to the 'git reset -q' executed in
> 'do_push_stash(...)'.
> diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
> index 5e68180f3b2..f2076545133 100755
> --- a/t/t7102-reset.sh
> +++ b/t/t7102-reset.sh
> @@ -482,7 +482,7 @@ test_index_refreshed () {
> git rm --cached file2 &&
>
> # Step 2
> - git reset $1 --mixed HEAD &&
> + git reset $@ --mixed HEAD &&
I see you change this from "$1" to "$@", which won't help with
the "-c key=value" issues from earlier.
>
> # Step 3
> git read-tree -m HEAD~1
> @@ -491,48 +491,66 @@ test_index_refreshed () {
> test_expect_success '--mixed refreshes the index' '
> # Verify default behavior (with no config settings or command line
> # options)
> - test_index_refreshed &&
> + test_index_refreshed
Ah, I see you fixed this here, probably just a rebase issue, then.
> test_expect_success '--mixed --[no-]quiet sets default refresh behavior' '
> # Verify that --[no-]quiet and `reset.quiet` (without --[no-]refresh)
> # determine refresh behavior
>
> - # Config setting
> - test_must_fail test_index_refreshed -c reset.quiet=true &&
> - test_index_refreshed -c reset.quiet=true &&
> -
Ah, and the -c changes are removed here. You could still test them
using the trick I mention in reply to patch 2.
> # Command line option
> - test_must_fail test_index_refreshed --quiet &&
> + ! test_index_refreshed --quiet &&
> test_index_refreshed --no-quiet &&
>
> - # Command line option overrides config setting
> - test_must_fail test_index_refreshed -c reset.quiet=false --quiet &&
> - test_index_refreshed -c reset.refresh=true --no-quiet
> + # Config: reset.quiet=false
> + test_config reset.quiet false &&
> + (
> + test_index_refreshed &&
> + ! test_index_refreshed --quiet
> + ) &&
> +
> + # Config: reset.quiet=true
> + test_config reset.quiet true &&
> + (
> + ! test_index_refreshed &&
> + test_index_refreshed --no-quiet
> + )
I'm not sure why you need sub-shells here. The test_config is
not scoped to the shell. These lines could be avoided with the
-c trick, which should make it a bit simpler to show what you
intend to be testing here.
Thanks,
-Stolee
next prev parent reply other threads:[~2022-03-14 15:10 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-12 0:08 [PATCH 0/5] Separate '--skip-refresh' from '--quiet' in 'reset', use '--quiet' internally in 'stash' Victoria Dye via GitGitGadget
2022-03-12 0:08 ` [PATCH 1/5] reset: revise index refresh advice Victoria Dye via GitGitGadget
2022-03-12 0:08 ` [PATCH 2/5] reset: introduce --[no-]refresh option to --mixed Victoria Dye via GitGitGadget
2022-03-14 15:05 ` Derrick Stolee
2022-03-14 15:13 ` Derrick Stolee
2022-03-14 15:55 ` Victoria Dye
2022-03-12 0:08 ` [PATCH 3/5] reset: replace '--quiet' with '--no-refresh' in performance advice Victoria Dye via GitGitGadget
2022-03-12 0:08 ` [PATCH 4/5] reset: suppress '--no-refresh' advice if logging is silenced Victoria Dye via GitGitGadget
2022-03-12 0:08 ` [PATCH 5/5] stash: make internal resets quiet and refresh index Victoria Dye via GitGitGadget
2022-03-14 15:10 ` Derrick Stolee [this message]
2022-03-14 15:56 ` Victoria Dye
2022-03-12 17:12 ` [PATCH 0/5] Separate '--skip-refresh' from '--quiet' in 'reset', use '--quiet' internally in 'stash' Victoria Dye
2022-03-14 6:22 ` Junio C Hamano
2022-03-14 15:13 ` Derrick Stolee
2022-03-14 16:10 ` [PATCH v2 0/5] Allow 'reset --quiet' to refresh the index, use 'reset --quiet' " Victoria Dye via GitGitGadget
2022-03-14 16:10 ` [PATCH v2 1/5] reset: revise index refresh advice Victoria Dye via GitGitGadget
2022-03-14 16:10 ` [PATCH v2 2/5] reset: introduce --[no-]refresh option to --mixed Victoria Dye via GitGitGadget
2022-03-14 19:27 ` Junio C Hamano
2022-03-14 23:48 ` Victoria Dye
2022-03-14 16:10 ` [PATCH v2 3/5] reset: replace '--quiet' with '--no-refresh' in performance advice Victoria Dye via GitGitGadget
2022-03-14 16:10 ` [PATCH v2 4/5] reset: suppress '--no-refresh' advice if logging is silenced Victoria Dye via GitGitGadget
2022-03-14 19:38 ` Junio C Hamano
2022-03-14 16:10 ` [PATCH v2 5/5] stash: make internal resets quiet and refresh index Victoria Dye via GitGitGadget
2022-03-14 19:42 ` Junio C Hamano
2022-03-14 23:54 ` Victoria Dye
2022-03-14 16:30 ` [PATCH v2 0/5] Allow 'reset --quiet' to refresh the index, use 'reset --quiet' in 'stash' Derrick Stolee
2022-03-14 23:17 ` Junio C Hamano
2022-03-15 1:49 ` [PATCH v3 " Victoria Dye via GitGitGadget
2022-03-15 1:49 ` [PATCH v3 1/5] reset: revise index refresh advice Victoria Dye via GitGitGadget
2022-03-15 1:49 ` [PATCH v3 2/5] reset: introduce --[no-]refresh option to --mixed Victoria Dye via GitGitGadget
2022-03-18 11:08 ` Phillip Wood
2022-03-18 17:17 ` Junio C Hamano
2022-03-18 19:19 ` Victoria Dye
2022-03-15 1:49 ` [PATCH v3 3/5] reset: replace '--quiet' with '--no-refresh' in performance advice Victoria Dye via GitGitGadget
2022-03-15 1:49 ` [PATCH v3 4/5] reset: suppress '--no-refresh' advice if logging is silenced Victoria Dye via GitGitGadget
2022-03-15 1:49 ` [PATCH v3 5/5] stash: make internal resets quiet and refresh index Victoria Dye via GitGitGadget
2022-03-15 10:23 ` Junio C Hamano
2022-03-16 20:07 ` Victoria Dye
2022-03-16 20:55 ` 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=41db12c3-029f-2e44-703c-90cb45ed9875@github.com \
--to=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--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).