From: "Keller, Jacob E" <jacob.e.keller@intel.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>,
Jacob Keller <jacob.keller@gmail.com>
Subject: RE: [PATCH] git-submodule: fix expansion of depth for cmd_update
Date: Thu, 22 Aug 2019 22:38:00 +0000 [thread overview]
Message-ID: <02874ECE860811409154E81DA85FBB5896860344@ORSMSX121.amr.corp.intel.com> (raw)
In-Reply-To: <xmqqh868oqxv.fsf@gitster-ct.c.googlers.com>
> -----Original Message-----
> From: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org] On Behalf Of
> Junio C Hamano
> Sent: Thursday, August 22, 2019 2:01 PM
> To: Keller, Jacob E <jacob.e.keller@intel.com>
> Cc: git@vger.kernel.org; Jacob Keller <jacob.keller@gmail.com>
> Subject: Re: [PATCH] git-submodule: fix expansion of depth for cmd_update
>
> Jacob Keller <jacob.e.keller@intel.com> writes:
>
> > From: Jacob Keller <jacob.keller@gmail.com>
> >
> > The depth variable already contains "--depth=", so expanding it with an
> > additional --depth when invoking the update-clone git submodule--helper
> > is incorrect.
> >
> > Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
> > ---
> >
> > I'm *reasonably* sure this is correct, but I am not sure how to test it.
> > It's possible that it expands to "--depth --depth=N" and somehow this gets
> > handled properly?
>
> I agree with your eyeballing of all the assignments to the variable,
> and other references to $depth take either one of these two forms:
>
> git submodule--helper ... ${depth:+"$depth"} ...
> git submodule--helper ... $depth ...
>
> As long as "git submodule ... --depth <depth> ..." gets called with
> <depth> that does not have $IFS, either would work fine, but the
> former is correct even when <depth> has problematic characters in it
> and your patch uses that form, too).
>
> However.
>
> The command line parser for update_clone() stuffs --depth as a
> string to suc.depth, and then the machinery ends up calling
> prepare_to_clone_next_submodule() with such an instance of suc
> (struct submodule_update_clone). Then that function just pushes the
> suc->depth to an argv array used to spawn a "submodule--helper clone".
>
> So passing "--depth --depth=23" would be "correct", sadly, in that
> codepath (I am not saying other codepaths would not call the same
> prepare_to_clone_next_submodule() with "--depth 23", as I didn't
> check, and if there is such a codepath, it would break).
>
Ok, so it's technically correct, but weird. I had trouble understanding it.
> We may need to clean the mess up X-<.
>
Yea, I got confused looking at this code. Though if I recall, we were working towards rewriting it in C anyways (which is what the submodule--helper is doing).
Thanks,
Jake
> > diff --git a/git-submodule.sh b/git-submodule.sh
> > index c7f58c5756f7..4e7fc8bf3652 100755
> > --- a/git-submodule.sh
> > +++ b/git-submodule.sh
> > @@ -547,7 +547,7 @@ cmd_update()
> > ${update:+--update "$update"} \
> > ${reference:+"$reference"} \
> > ${dissociate:+"--dissociate"} \
> > - ${depth:+--depth "$depth"} \
> > + ${depth:+"$depth"} \
> > $recommend_shallow \
> > $jobs \
> > -- \
prev parent reply other threads:[~2019-08-22 22:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-22 20:31 [PATCH] git-submodule: fix expansion of depth for cmd_update Jacob Keller
2019-08-22 21:01 ` Junio C Hamano
2019-08-22 22:38 ` Keller, Jacob E [this message]
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=02874ECE860811409154E81DA85FBB5896860344@ORSMSX121.amr.corp.intel.com \
--to=jacob.e.keller@intel.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@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).