From: Junio C Hamano <gitster@pobox.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH 2/4] lib-submodule-update: consolidate --recurse-submodules
Date: Wed, 29 Apr 2020 11:06:45 -0700 [thread overview]
Message-ID: <xmqqtv12w4i2.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <d5809877af3e20eb9ff459a91d3099846fd32197.1588162842.git.liu.denton@gmail.com> (Denton Liu's message of "Wed, 29 Apr 2020 08:22:24 -0400")
Denton Liu <liu.denton@gmail.com> writes:
> Both test_submodule_switch_recursing_with_args() and
> test_submodule_forced_switch_recursing_with_args() call the internal
> function test_submodule_recursing_with_args_common() with the final
> argument of `--recurse-submodules`. Consolidate this duplication by
> appending the argument in test_submodule_recursing_with_args_common().
>
OK, I just made sure that these two are the only callers and they
both pass the "--recurse-submodules", so the patch looks quite
sensible.
Thanks.
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
> t/lib-submodule-update.sh | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh
> index a3732d3f6c..81457b4c31 100644
> --- a/t/lib-submodule-update.sh
> +++ b/t/lib-submodule-update.sh
> @@ -632,7 +632,7 @@ test_submodule_forced_switch () {
> # Internal function; use test_submodule_switch_recursing_with_args() or
> # test_submodule_forced_switch_recursing_with_args() instead.
> test_submodule_recursing_with_args_common () {
> - command="$1"
> + command="$1 --recurse-submodules"
>
> ######################### Appearing submodule #########################
> # Switching to a commit letting a submodule appear checks it out ...
> @@ -840,7 +840,7 @@ test_submodule_recursing_with_args_common () {
> # test_submodule_switch_recursing_with_args "$GIT_COMMAND"
> test_submodule_switch_recursing_with_args () {
> cmd_args="$1"
> - command="git $cmd_args --recurse-submodules"
> + command="git $cmd_args"
> test_submodule_recursing_with_args_common "$command"
>
> RESULTDS=success
> @@ -957,7 +957,7 @@ test_submodule_switch_recursing_with_args () {
> # away local changes in the superproject is allowed.
> test_submodule_forced_switch_recursing_with_args () {
> cmd_args="$1"
> - command="git $cmd_args --recurse-submodules"
> + command="git $cmd_args"
> test_submodule_recursing_with_args_common "$command"
>
> RESULT=success
next prev parent reply other threads:[~2020-04-29 18:06 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 12:22 [PATCH 0/4] t: replace incorrect test_must_fail usage (part 5) Denton Liu
2020-04-29 12:22 ` [PATCH 1/4] lib-submodule-update: add space after function name Denton Liu
2020-04-29 12:22 ` [PATCH 2/4] lib-submodule-update: consolidate --recurse-submodules Denton Liu
2020-04-29 18:06 ` Junio C Hamano [this message]
2020-04-29 12:22 ` [PATCH 3/4] lib-submodule-update: prepend "git" to $command Denton Liu
2020-04-29 12:22 ` [PATCH 4/4] lib-submodule-update: pass OVERWRITING_FAIL Denton Liu
2020-04-29 19:24 ` Junio C Hamano
2020-04-30 1:10 ` Denton Liu
2020-04-30 3:41 ` Junio C Hamano
2020-04-30 9:22 ` Denton Liu
2020-04-30 10:25 ` [PATCH v1.1] " Denton Liu
2020-04-30 20:38 ` Junio C Hamano
2020-05-01 9:35 ` Denton Liu
2020-05-01 16:51 ` Junio C Hamano
2020-05-05 11:43 ` [PATCH v1.2] " Denton Liu
2020-04-29 19:50 ` [PATCH 0/4] t: replace incorrect test_must_fail usage (part 5) Taylor Blau
2020-04-29 21:30 ` Johannes Sixt
2020-04-29 21:42 ` Re* " Junio C Hamano
2020-04-29 21:49 ` Taylor Blau
2020-04-29 22:10 ` Junio C Hamano
2020-04-29 22:16 ` Taylor Blau
2020-04-29 22:36 ` Junio C Hamano
2020-04-29 22:41 ` Taylor Blau
2020-04-29 22:00 ` Eric Sunshine
2020-04-29 22:06 ` Junio C Hamano
2020-05-21 0:24 ` [PATCH v2 " Denton Liu
2020-05-21 0:24 ` [PATCH v2 1/4] lib-submodule-update: add space after function name Denton Liu
2020-05-21 0:24 ` [PATCH v2 2/4] lib-submodule-update: consolidate --recurse-submodules Denton Liu
2020-05-21 0:24 ` [PATCH v2 3/4] lib-submodule-update: prepend "git" to $command Denton Liu
2020-05-21 10:39 ` Philip Oakley
2020-05-21 11:25 ` Denton Liu
2020-05-21 0:24 ` [PATCH v2 4/4] lib-submodule-update: pass OVERWRITING_FAIL Denton Liu
2020-05-21 18:29 ` Jeff King
2020-05-21 18:55 ` Denton Liu
2020-05-21 21:11 ` Junio C Hamano
2020-05-21 22:37 ` Jeff King
2020-05-21 18:34 ` Jeff King
2020-05-21 16:47 ` [PATCH v2 0/4] t: replace incorrect test_must_fail usage (part 5) Junio C Hamano
2020-05-21 18:35 ` Jeff King
2020-06-11 17:41 ` [PATCH v3 " Denton Liu
2020-06-11 17:41 ` [PATCH v3 1/4] lib-submodule-update: add space after function name Denton Liu
2020-06-11 17:41 ` [PATCH v3 2/4] lib-submodule-update: consolidate --recurse-submodules Denton Liu
2020-06-11 17:41 ` [PATCH v3 3/4] lib-submodule-update: prepend "git" to $command Denton Liu
2020-06-11 17:41 ` [PATCH v3 4/4] lib-submodule-update: use callbacks in test_submodule_switch_common() Denton Liu
2020-06-12 18:46 ` Junio C Hamano
2020-06-18 6:11 ` Junio C Hamano
2020-06-18 8:49 ` [PATCH v4 0/4] t: replace incorrect test_must_fail usage (part 5) Denton Liu
2020-06-18 8:49 ` [PATCH v4 1/4] lib-submodule-update: add space after function name Denton Liu
2020-06-18 8:49 ` [PATCH v4 2/4] lib-submodule-update: consolidate --recurse-submodules Denton Liu
2020-06-18 8:49 ` [PATCH v4 3/4] lib-submodule-update: prepend "git" to $command Denton Liu
2020-06-18 8:49 ` [PATCH v4 4/4] lib-submodule-update: use callbacks in test_submodule_switch_common() Denton Liu
2020-06-18 18:15 ` Jeff King
2020-06-23 10:28 ` [PATCH v5 0/4] t: replace incorrect test_must_fail usage (part 5) Denton Liu
2020-06-23 10:28 ` [PATCH v5 1/4] lib-submodule-update: add space after function name Denton Liu
2020-06-23 10:28 ` [PATCH v5 2/4] lib-submodule-update: consolidate --recurse-submodules Denton Liu
2020-06-23 10:28 ` [PATCH v5 3/4] lib-submodule-update: prepend "git" to $command Denton Liu
2020-06-23 10:28 ` [PATCH v5 4/4] lib-submodule-update: use callbacks in test_submodule_switch_common() Denton Liu
2020-06-23 18:40 ` [PATCH v5 0/4] t: replace incorrect test_must_fail usage (part 5) Jeff King
2020-06-23 20:21 ` [PATCH v5.1] lib-submodule-update: pass 'test_must_fail' as an argument Denton Liu
2020-06-23 20:04 ` Denton Liu
2020-06-23 23:54 ` Junio C Hamano
2020-06-24 0:16 ` Đoàn Trần Công Danh
2020-06-24 8:50 ` [PATCH v5.2] " Denton Liu
2020-06-24 16:00 ` Junio C Hamano
2020-06-23 20:35 ` [PATCH v5.1] " Denton Liu
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtv12w4i2.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.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.
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 NNTP newsgroup(s).