From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/4] submodule update: add regression test with old style setups
Date: Sun, 09 Dec 2018 09:11:29 +0900 [thread overview]
Message-ID: <xmqqk1kj7e4u.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20181207235425.128568-2-sbeller@google.com> (Stefan Beller's message of "Fri, 7 Dec 2018 15:54:22 -0800")
Stefan Beller <sbeller@google.com> writes:
> As f178c13fda (Revert "Merge branch 'sb/submodule-core-worktree'",
> 2018-09-07) was produced shortly before a release, nobody asked for
> a regression test to be included. Add a regression test that makes sure
> that the invocation of `git submodule update` on old setups doesn't
> produce errors as pointed out in f178c13fda.
>
> The place to add such a regression test may look odd in t7412, but
> that is the best place as there we setup old style submodule setups
> explicitly.
Very good first step. Thanks.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
> t/t7412-submodule-absorbgitdirs.sh | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/t/t7412-submodule-absorbgitdirs.sh b/t/t7412-submodule-absorbgitdirs.sh
> index ce74c12da2..1cfa150768 100755
> --- a/t/t7412-submodule-absorbgitdirs.sh
> +++ b/t/t7412-submodule-absorbgitdirs.sh
> @@ -75,7 +75,12 @@ test_expect_success 're-setup nested submodule' '
> GIT_WORK_TREE=../../../nested git -C sub1/.git/modules/nested config \
> core.worktree "../../../nested" &&
> # make sure this re-setup is correct
> - git status --ignore-submodules=none
> + git status --ignore-submodules=none &&
> +
> + # also make sure this old setup does not regress
> + git submodule update --init --recursive >out 2>err &&
> + test_must_be_empty out &&
> + test_must_be_empty err
> '
>
> test_expect_success 'absorb the git dir in a nested submodule' '
next prev parent reply other threads:[~2018-12-09 0:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-07 23:54 [PATCH 0/4] Stefan Beller
2018-12-07 23:54 ` [PATCH 1/4] submodule update: add regression test with old style setups Stefan Beller
2018-12-09 0:11 ` Junio C Hamano [this message]
2018-12-07 23:54 ` [PATCH 2/4] submodule: unset core.worktree if no working tree is present Stefan Beller
2018-12-08 6:44 ` Junio C Hamano
2018-12-07 23:54 ` [PATCH 3/4] submodule--helper: fix BUG message in ensure_core_worktree Stefan Beller
2018-12-08 6:55 ` Junio C Hamano
2018-12-12 22:46 ` Stefan Beller
2018-12-13 3:14 ` Junio C Hamano
2018-12-07 23:54 ` [PATCH 4/4] submodule deinit: unset core.worktree Stefan Beller
2018-12-08 7:03 ` Junio C Hamano
2018-12-08 5:57 ` [PATCH 0/4] Junio C Hamano
2018-12-12 22:35 ` Stefan Beller
2018-12-13 3:15 ` Junio C Hamano
2018-12-14 23:59 ` [PATCH 0/4] submodules: unset core.worktree when no working tree present Stefan Beller
2018-12-14 23:59 ` [PATCH 1/4] submodule update: add regression test with old style setups Stefan Beller
2018-12-26 18:21 ` Junio C Hamano
2018-12-14 23:59 ` [PATCH 2/4] submodule: unset core.worktree if no working tree is present Stefan Beller
2018-12-26 18:27 ` Junio C Hamano
2018-12-14 23:59 ` [PATCH 3/4] submodule--helper: fix BUG message in ensure_core_worktree Stefan Beller
2018-12-14 23:59 ` [PATCH 4/4] submodule deinit: unset core.worktree Stefan Beller
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=xmqqk1kj7e4u.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sbeller@google.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).