From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH 2/2] submodule.c: warn about missing submodule git directories
Date: Mon, 27 Aug 2018 15:12:57 -0700 [thread overview]
Message-ID: <20180827221257.149257-2-sbeller@google.com> (raw)
In-Reply-To: <20180827221257.149257-1-sbeller@google.com>
This is the continuation of f2d48994dc1 (submodule.c: submodule_move_head
works with broken submodules, 2017-04-18), which tones down the case of
"broken submodule" in case of a missing git directory of the submodule to
be only a warning.
Signed-off-by: Stefan Beller <sbeller@google.com>
---
submodule.c | 16 ++++++++++++++++
t/t2013-checkout-submodule.sh | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/submodule.c b/submodule.c
index 50cbf5f13ed..689439a3d0c 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1641,6 +1641,22 @@ int submodule_move_head(const char *path,
} else {
char *gitdir = xstrfmt("%s/modules/%s",
get_git_common_dir(), sub->name);
+
+ if (!is_git_directory(gitdir)) {
+ /*
+ * It is safe to assume we could just clone
+ * the submodule here, as we passed the
+ * is_submodule_active test above (i.e. the
+ * user is interested in this submodule.
+ *
+ * However as this code path is exercised
+ * for operations that typically do not involve
+ * network operations, let's not do that for now.
+ */
+ warning(_("Submodule '%s' missing"), path);
+ free(gitdir);
+ return 0;
+ }
connect_work_tree_and_git_dir(path, gitdir, 0);
free(gitdir);
diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh
index c69640fc341..82ef4576b91 100755
--- a/t/t2013-checkout-submodule.sh
+++ b/t/t2013-checkout-submodule.sh
@@ -81,7 +81,7 @@ test_expect_success 'setup superproject with historic submodule' '
test_must_be_empty super1/.gitmodules
'
-test_expect_failure 'checkout old state with deleted submodule' '
+test_expect_success '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
--
2.18.0
next prev parent 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 [PATCH 1/2] t2013: add test for missing but active submodule Stefan Beller
2018-08-27 22:12 ` Stefan Beller [this message]
2018-08-28 18:56 ` [PATCH 2/2] submodule.c: warn about missing submodule git directories 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-2-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).