From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH 1/2] t2013: add test for missing but active submodule
Date: Mon, 27 Aug 2018 15:12:56 -0700 [thread overview]
Message-ID: <20180827221257.149257-1-sbeller@google.com> (raw)
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 &&
+ 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
+'
+
+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
next reply other threads:[~2018-08-27 22:13 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-27 22:12 Stefan Beller [this message]
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 ` [PATCH 1/2] t2013: add test for missing but active submodule SZEDER Gábor
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=20180827221257.149257-1-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
/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).