From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Stefan Beller <sbeller@google.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/2] t2013: add test for missing but active submodule
Date: Wed, 29 Aug 2018 23:04:36 +0200 [thread overview]
Message-ID: <20180829210436.GA31707@localhost> (raw)
In-Reply-To: <20180827221257.149257-1-sbeller@google.com>
On Mon, Aug 27, 2018 at 03:12:56PM -0700, Stefan Beller wrote:
> When cloning a superproject with the option
> --recurse-submodules='.', it is easy to find yourself wanting
> a submodule active, but not having that submodule present in
> the modules directory.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
> t/t2013-checkout-submodule.sh | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh
> index 6ef15738e44..c69640fc341 100755
> --- a/t/t2013-checkout-submodule.sh
> +++ b/t/t2013-checkout-submodule.sh
> @@ -63,6 +63,30 @@ test_expect_success '"checkout <submodule>" honors submodule.*.ignore from .git/
> ! test -s actual
> '
>
> +test_expect_success 'setup superproject with historic submodule' '
> + test_create_repo super1 &&
> + test_create_repo sub1 &&
> + test_commit -C sub1 sub_content &&
> + git -C super1 submodule add ../sub1 &&
> + git -C super1 commit -a -m "sub1 added" &&
> + test_commit -C super1 historic_state &&
> + git -C super1 rm sub1 &&
> + git -C super1 commit -a -m "deleted sub" &&
> + test_commit -C super1 new_state &&
These six consecutive commands above all specify the '-C super1'
options ...
> + test_path_is_missing super1/sub &&
> +
> + # The important part is to ensure sub1 is not in there any more.
> + # There is another series in flight, that may remove an
> + # empty .gitmodules file entirely.
> + test_must_be_empty super1/.gitmodules
... and both of these two checks use the 'super1/' path prefix. I
think it would be more readable to simply 'cd super1' first.
> +'
> +
> +test_expect_failure 'checkout old state with deleted submodule' '
> + test_when_finished "rm -rf super1 sub1 super1_clone" &&
> + git clone --recurse-submodules super1 super1_clone &&
> + git -C super1_clone checkout --recurse-submodules historic_state
> +'
> +
> KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
> test_submodule_switch_recursing_with_args "checkout"
>
> --
> 2.18.0
>
prev parent reply other threads:[~2018-08-29 21:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-27 22:12 [PATCH 1/2] t2013: add test for missing but active submodule Stefan Beller
2018-08-27 22:12 ` [PATCH 2/2] submodule.c: warn about missing submodule git directories Stefan Beller
2018-08-28 18:56 ` Junio C Hamano
2018-08-28 21:49 ` Stefan Beller
2018-08-29 17:16 ` Junio C Hamano
2018-08-29 20:32 ` Stefan Beller
2018-09-05 19:18 ` Jonathan Nieder
2018-09-07 18:49 ` Stefan Beller
2018-09-07 19:53 ` Jonathan Nieder
2018-08-29 21:04 ` SZEDER Gábor [this message]
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=20180829210436.GA31707@localhost \
--to=szeder.dev@gmail.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).