From: Junio C Hamano <gitster@pobox•com>
To: Stefan Beller <sbeller@google•com>
Cc: git@vger•kernel.org, jrnieder@gmail•com, Jens.Lehmann@web•de
Subject: Re: [PATCHv4 8/8] clone: recursive and reference option triggers submodule alternates
Date: Fri, 12 Aug 2016 15:32:55 -0700 [thread overview]
Message-ID: <xmqq60r5vcrs.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160811231405.17318-9-sbeller@google.com> (Stefan Beller's message of "Thu, 11 Aug 2016 16:14:05 -0700")
Stefan Beller <sbeller@google•com> writes:
> +int add_possible_reference_from_superproject(
> + struct alternate_object_database *alt, void *sas_cb)
> +{
> + struct submodule_alternate_setup *sas = sas_cb;
> +
> + ...
> + size_t namelen = alt->name - alt->base - 1;
> + struct strbuf name = STRBUF_INIT;
> + strbuf_add(&name, alt->base, namelen);
> +
> + /*
> + * If the alternate object store is another repository, try the
> + * standard layout with .git/modules/<name>/objects
> + */
> + if (ends_with(name.buf, ".git/objects")) {
> + char *sm_alternate;
> + struct strbuf sb = STRBUF_INIT;
> + struct strbuf err = STRBUF_INIT;
> + strbuf_add(&sb, name.buf, name.len - strlen("objects"));
> + /*
> + * We need to end the new path with '/' to mark it as a dir,
> + * otherwise a submodule name containing '/' will be broken
> + * as the last part of a missing submodule reference would
> + * be taken as a file name.
> + */
> + strbuf_addf(&sb, "modules/%s/", sas->submodule_name);
> +
> + sm_alternate = compute_alternate_path(sb.buf, &err);
OK. Thanks to the refactoring in the earlier step, this has become
quite straight-forward and robust; this code will always decide if
the other directory can be used as an alternate the same way the
"git clone" we will call would decide.
Good.
next prev parent reply other threads:[~2016-08-12 22:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-11 23:13 [PATCHv4 0/6] git clone: Marry --recursive and --reference Stefan Beller
2016-08-11 23:13 ` [PATCHv4 1/8] t7408: modernize style Stefan Beller
2016-08-11 23:13 ` [PATCHv4 2/8] t7408: merge short tests, factor out testing method Stefan Beller
2016-08-11 23:14 ` [PATCHv4 3/8] submodule--helper module-clone: allow multiple references Stefan Beller
2016-08-11 23:14 ` [PATCHv4 4/8] submodule--helper update-clone: " Stefan Beller
2016-08-11 23:14 ` [PATCHv4 5/8] clone: factor out checking for an alternate path Stefan Beller
2016-08-12 22:25 ` Junio C Hamano
2016-08-15 19:03 ` Stefan Beller
2016-08-15 20:36 ` Junio C Hamano
2016-08-15 21:44 ` Stefan Beller
2016-08-11 23:14 ` [PATCHv4 6/8] clone: clarify option_reference as required Stefan Beller
2016-08-11 23:14 ` [PATCHv4 7/8] clone: implement optional references Stefan Beller
2016-08-11 23:14 ` [PATCHv4 8/8] clone: recursive and reference option triggers submodule alternates Stefan Beller
2016-08-12 22:32 ` Junio C Hamano [this message]
2016-08-17 20:02 ` Junio C Hamano
2016-08-17 20:53 ` Stefan Beller
2016-08-17 21:31 ` Junio C Hamano
2016-08-17 21:41 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq60r5vcrs.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Jens.Lehmann@web$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=jrnieder@gmail$(echo .)com \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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