From: Stefan Beller <sbeller@google.com>
To: vi0oss@gmail.com
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
Stefan Beller <stefanbeller@gmail.com>
Subject: Re: [PATCH] submodule--helper: set alternateLocation for cloned submodules
Date: Wed, 7 Dec 2016 12:09:39 -0800 [thread overview]
Message-ID: <CAGZ79kY3LR2KA69b4iDJb164EhJLb3JuVSRRcN0-4-kp-eryog@mail.gmail.com> (raw)
In-Reply-To: <20161207184248.6130-1-vi0oss@gmail.com>
On Wed, Dec 7, 2016 at 10:42 AM, <vi0oss@gmail.com> wrote:
> From: Vitaly _Vi Shukela <vi0oss@gmail.com>
Thanks for contributing to Git!
(/me looks up if you have sent patches already as you
seem to know how to do that. :) unrelated side note: Maybe you want
to send a patch for the .mailmap file mapping your two email addresses
together, c.f. "git log -- .mailmap")
>
> Git v2.11 introduced "git clone --recursive --referece ...",
> but it didn't put the alternates for _nested_ submodules.
This message is targeted at people familiar with gits code base,
so we can be more specific. e.g.
In 31224cbdc7 (clone: recursive and reference option triggers
submodule alternates, 2016-08-17) a mechanism was added to
have submodules referenced. It did not address _nested_
submodules, however.
>
> This patch makes all not just the root repository, but also
> all submodules (recursively) have submodule.alternateLocation
> and submodule.alternateErrorStrategy configured, making Git
> search for possible alternates for nested submodules as well.
Sounds great!
>
> As submodule's alternate target does not end in .git/objects
> (rather .git/modules/qqqqqq/objects), this alternate target
> path restriction for in add_possible_reference_from_superproject
> relates from "*.git/objects" to just */objects".
I wonder if this check is too weak and we actually have to check for
either .git/objects or modules/<name/possibly/having/slashes>/objects.
When writing the referenced commit I assumed we'd need a stronger check
to be safer and not add some random location as a possible alternate.
>
> New tests have been added to t7408-submodule-reference.
Thanks!
>
> Signed-off-by: Vitaly _Vi Shukela <vi0oss@gmail.com>
> ---
> builtin/submodule--helper.c | 24 ++++++++++++--
> t/t7408-submodule-reference.sh | 73 ++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 95 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
> index 4beeda5..93dae62 100644
> --- a/builtin/submodule--helper.c
> +++ b/builtin/submodule--helper.c
> @@ -498,9 +498,9 @@ static int add_possible_reference_from_superproject(
>
> /*
> * If the alternate object store is another repository, try the
> - * standard layout with .git/modules/<name>/objects
> + * standard layout with .git/(modules/<name>)+/objects
> */
> - if (ends_with(alt->path, ".git/objects")) {
> + if (ends_with(alt->path, "/objects")) {
> char *sm_alternate;
> struct strbuf sb = STRBUF_INIT;
> struct strbuf err = STRBUF_INIT;
> @@ -672,6 +672,26 @@ static int module_clone(int argc, const char **argv, const char *prefix)
> die(_("could not get submodule directory for '%s'"), path);
> git_config_set_in_file(p, "core.worktree",
> relative_path(path, sm_gitdir, &rel_path));
> +
> + /* setup alternateLocation and alternateErrorStrategy in the cloned submodule if needed */
> + {
Usually we do not use braces to further nest code, please remove this nesting.
> + char *sm_alternate = NULL, *error_strategy = NULL;
> +
> + git_config_get_string("submodule.alternateLocation", &sm_alternate);
> + if (sm_alternate) {
> + git_config_set_in_file(p, "submodule.alternateLocation",
> + sm_alternate);
> + }
> + git_config_get_string("submodule.alternateErrorStrategy", &error_strategy);
> + if (error_strategy) {
> + git_config_set_in_file(p, "submodule.alternateErrorStrategy",
> + error_strategy);
> + }
> +
> + free(sm_alternate);
> + free(error_strategy);
> + }
> +
> strbuf_release(&sb);
> strbuf_release(&rel_path);
> free(sm_gitdir);
> diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh
> index 1c1e289..7b64725 100755
> --- a/t/t7408-submodule-reference.sh
> +++ b/t/t7408-submodule-reference.sh
> @@ -125,4 +125,77 @@ test_expect_success 'ignoring missing submodule alternates passes clone and subm
> )
> '
>
> +test_expect_success 'preparing second superproject with a nested submodule' '
> + test_create_repo supersuper &&
> + (
> + cd supersuper &&
> + echo I am super super. >file &&
Usually we quote strings containing white space, e.g. echo "I am ..." >actual
> + git add file &&
> + git commit -m B-super-super-initial
> + git submodule add "file://$base_dir/super" subwithsub &&
> + git commit -m B-super-super-added &&
> + git submodule update --init --recursive &&
> + git repack -ad
> + ) &&
> + echo not cleaning supersuper
This echo is left in for debugging purposes?
next prev parent reply other threads:[~2016-12-07 20:09 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-07 18:42 [PATCH] submodule--helper: set alternateLocation for cloned submodules vi0oss
2016-12-07 20:09 ` Stefan Beller [this message]
2016-12-07 20:18 ` Junio C Hamano
2016-12-07 20:26 ` Stefan Beller
2016-12-07 20:28 ` Junio C Hamano
2016-12-07 21:24 ` vi0oss
2016-12-07 22:09 ` Stefan Beller
-- strict thread matches above, loose matches on Subject: below --
2016-12-08 0:39 vi0oss
2016-12-08 1:22 ` Stefan Beller
2016-12-08 17:46 ` Jeff King
2016-12-08 18:04 ` Stefan Beller
2016-12-08 18:04 ` vi0oss
2016-12-08 18:21 ` Stefan Beller
2016-12-08 18:53 ` Jeff King
2016-12-08 1:38 vi0oss
2016-12-10 13:41 ` vi0oss
2016-12-12 5:35 ` Stefan Beller
2016-12-12 18:00 ` Junio C Hamano
2016-12-12 2:45 vi0oss
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=CAGZ79kY3LR2KA69b4iDJb164EhJLb3JuVSRRcN0-4-kp-eryog@mail.gmail.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
--cc=stefanbeller@gmail.com \
--cc=vi0oss@gmail.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).