From: Philip Oakley <philipoakley@iee.email>
To: Denton Liu <liu.denton@gmail.com>,
Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>, Taylor Blau <me@ttaylorr.com>,
Johannes Sixt <j6t@kdbg.org>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v2 3/4] lib-submodule-update: prepend "git" to $command
Date: Thu, 21 May 2020 11:39:48 +0100 [thread overview]
Message-ID: <1746f977-64cc-ede0-04f7-7cfd1afb1691@iee.email> (raw)
In-Reply-To: <578bab6f1af351fd3721d56bea78abec6c9ae2f9.1590019226.git.liu.denton@gmail.com>
Hi Denton,
On 21/05/2020 01:24, Denton Liu wrote:
> Since all invocations of test_submodule_forced_switch() are git
> commands, automatically prepend "git" before invoking
> test_submodule_switch_common().
>
> Similarly, many invocations of test_submodule_switch() are also git
> commands so automatically prepend "git" before invoking
> test_submodule_switch_common() as well.
>
> Finally, for invocations of test_submodule_switch() that invoke a custom
> function, rename the old function to test_submodule_switch_func().
>
> This is necessary because in a future commit, we will be adding some
> logic that needs to distinguish between an invocation of a plain git
> comamnd and an invocation of a test helper function.
>
> Signed-off-by: Denton Liu <liu.denton@gmail.com>
> ---
> t/lib-submodule-update.sh | 14 +++++++++-----
> t/t1013-read-tree-submodule.sh | 4 ++--
> t/t2013-checkout-submodule.sh | 4 ++--
> t/t3426-rebase-submodule.sh | 4 ++--
> t/t3512-cherry-pick-submodule.sh | 2 +-
> t/t3513-revert-submodule.sh | 2 +-
> t/t3906-stash-submodule.sh | 2 +-
> t/t4137-apply-submodule.sh | 4 ++--
> t/t4255-am-submodule.sh | 4 ++--
> t/t5572-pull-submodule.sh | 8 ++++----
> t/t6041-bisect-submodule.sh | 2 +-
> t/t7112-reset-submodule.sh | 6 +++---
> t/t7613-merge-submodule.sh | 8 ++++----
> 13 files changed, 34 insertions(+), 30 deletions(-)
>
> diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh
> index bb36287803..fb6c0f3d4f 100755
> --- a/t/lib-submodule-update.sh
> +++ b/t/lib-submodule-update.sh
> @@ -307,8 +307,8 @@ test_submodule_content () {
> # to protect the history!
> #
>
> -# Internal function; use test_submodule_switch() or
> -# test_submodule_forced_switch() instead.
> +# Internal function; use test_submodule_switch_func(), test_submodule_switch_func(),
Is this an accidental duplication of test_submodule_switch_func(),?
(spotted in passing)
--
Philip
> +# or test_submodule_forced_switch() instead.
> test_submodule_switch_common () {
> command="$1"
> ######################### Appearing submodule #########################
> @@ -566,8 +566,8 @@ test_submodule_switch_common () {
> # # Do something here that updates the worktree and index to match target,
> # # but not any submodule directories.
> # }
> -# test_submodule_switch "my_func"
> -test_submodule_switch () {
> +# test_submodule_switch_func "my_func"
> +test_submodule_switch_func () {
> command="$1"
> test_submodule_switch_common "$command"
>
> @@ -587,12 +587,16 @@ test_submodule_switch () {
> '
> }
>
> +test_submodule_switch () {
> + test_submodule_switch_func "git $1"
> +}
> +
> # Same as test_submodule_switch(), except that throwing away local changes in
> # the superproject is allowed.
> test_submodule_forced_switch () {
> command="$1"
> KNOWN_FAILURE_FORCED_SWITCH_TESTS=1
> - test_submodule_switch_common "$command"
> + test_submodule_switch_common "git $command"
>
> # When forced, a file in the superproject does not prevent creating a
> # submodule of the same name.
> diff --git a/t/t1013-read-tree-submodule.sh b/t/t1013-read-tree-submodule.sh
> index 91a6fafcb4..b6df7444c0 100755
> --- a/t/t1013-read-tree-submodule.sh
> +++ b/t/t1013-read-tree-submodule.sh
> @@ -12,8 +12,8 @@ test_submodule_switch_recursing_with_args "read-tree -u -m"
>
> test_submodule_forced_switch_recursing_with_args "read-tree -u --reset"
>
> -test_submodule_switch "git read-tree -u -m"
> +test_submodule_switch "read-tree -u -m"
>
> -test_submodule_forced_switch "git read-tree -u --reset"
> +test_submodule_forced_switch "read-tree -u --reset"
>
> test_done
> diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh
> index 8f86b5f4b2..b2bdd1fcb4 100755
> --- a/t/t2013-checkout-submodule.sh
> +++ b/t/t2013-checkout-submodule.sh
> @@ -68,8 +68,8 @@ test_submodule_switch_recursing_with_args "checkout"
>
> test_submodule_forced_switch_recursing_with_args "checkout -f"
>
> -test_submodule_switch "git checkout"
> +test_submodule_switch "checkout"
>
> -test_submodule_forced_switch "git checkout -f"
> +test_submodule_forced_switch "checkout -f"
>
> test_done
> diff --git a/t/t3426-rebase-submodule.sh b/t/t3426-rebase-submodule.sh
> index a2bba04ba9..788605ccc0 100755
> --- a/t/t3426-rebase-submodule.sh
> +++ b/t/t3426-rebase-submodule.sh
> @@ -20,7 +20,7 @@ git_rebase () {
> git rebase "$1"
> }
>
> -test_submodule_switch "git_rebase"
> +test_submodule_switch_func "git_rebase"
>
> git_rebase_interactive () {
> git status -su >expect &&
> @@ -38,7 +38,7 @@ git_rebase_interactive () {
> git rebase -i "$1"
> }
>
> -test_submodule_switch "git_rebase_interactive"
> +test_submodule_switch_func "git_rebase_interactive"
>
> test_expect_success 'rebase interactive ignores modified submodules' '
> test_when_finished "rm -rf super sub" &&
> diff --git a/t/t3512-cherry-pick-submodule.sh b/t/t3512-cherry-pick-submodule.sh
> index bd78287841..6ece1d8573 100755
> --- a/t/t3512-cherry-pick-submodule.sh
> +++ b/t/t3512-cherry-pick-submodule.sh
> @@ -7,7 +7,7 @@ test_description='cherry-pick can handle submodules'
>
> KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
> KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
> -test_submodule_switch "git cherry-pick"
> +test_submodule_switch "cherry-pick"
>
> test_expect_success 'unrelated submodule/file conflict is ignored' '
> test_create_repo sub &&
> diff --git a/t/t3513-revert-submodule.sh b/t/t3513-revert-submodule.sh
> index 5e39fcdb66..95a7f64471 100755
> --- a/t/t3513-revert-submodule.sh
> +++ b/t/t3513-revert-submodule.sh
> @@ -26,6 +26,6 @@ git_revert () {
> }
>
> KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
> -test_submodule_switch "git_revert"
> +test_submodule_switch_func "git_revert"
>
> test_done
> diff --git a/t/t3906-stash-submodule.sh b/t/t3906-stash-submodule.sh
> index b93d1d74da..6a7e801ca0 100755
> --- a/t/t3906-stash-submodule.sh
> +++ b/t/t3906-stash-submodule.sh
> @@ -19,7 +19,7 @@ git_stash () {
> KNOWN_FAILURE_STASH_DOES_IGNORE_SUBMODULE_CHANGES=1
> KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
> KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
> -test_submodule_switch "git_stash"
> +test_submodule_switch_func "git_stash"
>
> setup_basic () {
> test_when_finished "rm -rf main sub" &&
> diff --git a/t/t4137-apply-submodule.sh b/t/t4137-apply-submodule.sh
> index a9bd40a6d0..b645e303a0 100755
> --- a/t/t4137-apply-submodule.sh
> +++ b/t/t4137-apply-submodule.sh
> @@ -9,12 +9,12 @@ apply_index () {
> git diff --ignore-submodules=dirty "..$1" | git apply --index -
> }
>
> -test_submodule_switch "apply_index"
> +test_submodule_switch_func "apply_index"
>
> apply_3way () {
> git diff --ignore-submodules=dirty "..$1" | git apply --3way -
> }
>
> -test_submodule_switch "apply_3way"
> +test_submodule_switch_func "apply_3way"
>
> test_done
> diff --git a/t/t4255-am-submodule.sh b/t/t4255-am-submodule.sh
> index 0ba8194403..1b179d5f45 100755
> --- a/t/t4255-am-submodule.sh
> +++ b/t/t4255-am-submodule.sh
> @@ -9,14 +9,14 @@ am () {
> git format-patch --stdout --ignore-submodules=dirty "..$1" | git am -
> }
>
> -test_submodule_switch "am"
> +test_submodule_switch_func "am"
>
> am_3way () {
> git format-patch --stdout --ignore-submodules=dirty "..$1" | git am --3way -
> }
>
> KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
> -test_submodule_switch "am_3way"
> +test_submodule_switch_func "am_3way"
>
> test_expect_success 'setup diff.submodule' '
> test_commit one &&
> diff --git a/t/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh
> index f916729a12..f911bf631e 100755
> --- a/t/t5572-pull-submodule.sh
> +++ b/t/t5572-pull-submodule.sh
> @@ -17,21 +17,21 @@ git_pull () {
> }
>
> # pulls without conflicts
> -test_submodule_switch "git_pull"
> +test_submodule_switch_func "git_pull"
>
> git_pull_ff () {
> reset_branch_to_HEAD "$1" &&
> git pull --ff
> }
>
> -test_submodule_switch "git_pull_ff"
> +test_submodule_switch_func "git_pull_ff"
>
> git_pull_ff_only () {
> reset_branch_to_HEAD "$1" &&
> git pull --ff-only
> }
>
> -test_submodule_switch "git_pull_ff_only"
> +test_submodule_switch_func "git_pull_ff_only"
>
> git_pull_noff () {
> reset_branch_to_HEAD "$1" &&
> @@ -40,7 +40,7 @@ git_pull_noff () {
>
> KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
> KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
> -test_submodule_switch "git_pull_noff"
> +test_submodule_switch_func "git_pull_noff"
>
> test_expect_success 'pull --recurse-submodule setup' '
> test_create_repo child &&
> diff --git a/t/t6041-bisect-submodule.sh b/t/t6041-bisect-submodule.sh
> index 62b8a2e7bb..0e0cdf638d 100755
> --- a/t/t6041-bisect-submodule.sh
> +++ b/t/t6041-bisect-submodule.sh
> @@ -27,6 +27,6 @@ git_bisect () {
> git bisect bad $BAD
> }
>
> -test_submodule_switch "git_bisect"
> +test_submodule_switch_func "git_bisect"
>
> test_done
> diff --git a/t/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh
> index a1cb9ff858..8741b665c9 100755
> --- a/t/t7112-reset-submodule.sh
> +++ b/t/t7112-reset-submodule.sh
> @@ -13,10 +13,10 @@ test_submodule_switch_recursing_with_args "reset --keep"
>
> test_submodule_forced_switch_recursing_with_args "reset --hard"
>
> -test_submodule_switch "git reset --keep"
> +test_submodule_switch "reset --keep"
>
> -test_submodule_switch "git reset --merge"
> +test_submodule_switch "reset --merge"
>
> -test_submodule_forced_switch "git reset --hard"
> +test_submodule_forced_switch "reset --hard"
>
> test_done
> diff --git a/t/t7613-merge-submodule.sh b/t/t7613-merge-submodule.sh
> index d1e9fcc781..04bf4be7d7 100755
> --- a/t/t7613-merge-submodule.sh
> +++ b/t/t7613-merge-submodule.sh
> @@ -6,14 +6,14 @@ test_description='merge can handle submodules'
> . "$TEST_DIRECTORY"/lib-submodule-update.sh
>
> # merges without conflicts
> -test_submodule_switch "git merge"
> +test_submodule_switch "merge"
>
> -test_submodule_switch "git merge --ff"
> +test_submodule_switch "merge --ff"
>
> -test_submodule_switch "git merge --ff-only"
> +test_submodule_switch "merge --ff-only"
>
> KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
> KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
> -test_submodule_switch "git merge --no-ff"
> +test_submodule_switch "merge --no-ff"
>
> test_done
next prev parent reply other threads:[~2020-05-21 10:40 UTC|newest]
Thread overview: 64+ 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
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 [this message]
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 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
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=1746f977-64cc-ede0-04f7-7cfd1afb1691@iee.email \
--to=philipoakley@iee.email \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=liu.denton@gmail.com \
--cc=me@ttaylorr.com \
--cc=sunshine@sunshineco.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).