From: Jeff King <peff@peff.net>
To: Stefan Beller <sbeller@google.com>
Cc: Brandon Williams <bmwill@google.com>,
Junio C Hamano <gitster@pobox.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: [PATCH v2 0/2] warn when adding an embedded repository
Date: Wed, 14 Jun 2017 06:54:37 -0400 [thread overview]
Message-ID: <20170614105437.cgdlykmtocdj5vzw@sigill.intra.peff.net> (raw)
In-Reply-To: <20170614063614.a34ovimjpz2g24qe@sigill.intra.peff.net>
On Wed, Jun 14, 2017 at 02:36:14AM -0400, Jeff King wrote:
> > This patch looks good to me, apart from the perceived wording nits.
>
> Thanks. I'll re-roll with a few tweaks based on your feedback.
Here it is. It just changes the wording and fixes the test as you
suggested.
[1/2]: add: warn when adding an embedded repository
[2/2]: t: move "git add submodule" into test blocks
I had some thoughts on adding a third patch to cover the case where
.gitmodules has already been updated. But I couldn't figure out how to
make it work. The patch I came up with is below:
diff --git a/builtin/add.c b/builtin/add.c
index d7cab1bd8..d20052462 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -322,6 +322,8 @@ static void check_embedded_repo(const char *path)
return;
if (!ends_with(path, "/"))
return;
+ if (is_submodule_initialized(path))
+ return;
/* Drop trailing slash for aesthetics */
strbuf_addstr(&name, path);
diff --git a/t/t7414-submodule-mistakes.sh b/t/t7414-submodule-mistakes.sh
index f2e7df59c..aee52b218 100755
--- a/t/t7414-submodule-mistakes.sh
+++ b/t/t7414-submodule-mistakes.sh
@@ -34,4 +34,14 @@ test_expect_success 'submodule add does not warn' '
test_i18ngrep ! warning stderr
'
+test_expect_success 'making your own submodule does not warn' '
+ test_when_finished "git rm --cached -f embed &&
+ git rm -f .gitmodules" &&
+ git config -f .gitmodules submodule.embed.path embed &&
+ git config -f .gitmodules submodule.embed.url \
+ git://example.com/embed.git &&
+ git add embed 2>stderr &&
+ test_i18ngrep ! warning stderr
+'
+
test_done
But that doesn't quite work. Because the submodule data is just in
.gitmodules, it's not actually "initialized". I think that might work if
instead it was:
git config submodule.embed.url ...
but I'm not clear on whether that should work, or if it's even something
somebody would want to do. So I decided to punt on the whole thing and
let somebody work on it who a) knows more about how submodules work or
b) has some not-quite-submodule use case for gitlinks that they want to
have work (without a warning).
-Peff
next prev parent reply other threads:[~2017-06-14 10:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-06 3:56 [BUG?] gitlink without .gitmodules no longer fails recursive clone Jeff King
2017-06-06 18:01 ` Stefan Beller
2017-06-06 18:10 ` Brandon Williams
2017-06-06 18:39 ` Jeff King
2017-06-09 23:19 ` Jeff King
2017-06-10 2:10 ` Junio C Hamano
2017-06-10 7:13 ` Jeff King
2017-06-10 11:12 ` Junio C Hamano
2017-06-12 5:30 ` Stefan Beller
2017-06-13 9:14 ` Jeff King
2017-06-13 9:24 ` [PATCH 1/2] add: warn when adding an embedded repository Jeff King
2017-06-13 17:07 ` Stefan Beller
2017-06-13 17:16 ` Brandon Williams
2017-06-14 6:36 ` Jeff King
2017-06-14 10:54 ` Jeff King [this message]
2017-06-14 10:58 ` [PATCH v2 " Jeff King
2017-06-14 10:58 ` [PATCH v2 2/2] t: move "git add submodule" into test blocks Jeff King
2017-06-14 17:53 ` [PATCH 1/2] add: warn when adding an embedded repository Stefan Beller
2017-06-15 6:01 ` Jeff King
2017-06-13 17:16 ` Junio C Hamano
2017-06-14 6:38 ` Jeff King
2017-06-13 9:24 ` [PATCH 2/2] t: move "git add submodule" into test blocks Jeff King
2017-06-13 17:15 ` 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=20170614105437.cgdlykmtocdj5vzw@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=bmwill@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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).