# [PATCH] submodule: do no re-read name in shell script 3 messages from 2016-07-21 to 2016-07-21. Participants: Stefan Beller, Jonathan Nieder. Thread: https://gitlist.dev/t/42893 ## Stefan Beller, 2016-07-21 00:51 Subject: [PATCH] submodule: do no re-read name in shell script Message-ID: <20160721005122.15966-1-sbeller@google.com> URL: https://gitlist.dev/e/20160721005122.15966-1-sbeller%40google.com ``` Instead of making another call to a submodule helper (name), just propagate the value when we know it (in the update-clone helper) already. Signed-off-by: Stefan Beller --- builtin/submodule--helper.c | 4 ++-- git-submodule.sh | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index b22352b..494e088 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -683,9 +683,9 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, needs_cloning = !file_exists(sb.buf); strbuf_reset(&sb); - strbuf_addf(&sb, "%06o %s %d %d\t%s\n", ce->ce_mode, + strbuf_addf(&sb, "%06o %s %d %d %s\t%s\n", ce->ce_mode, sha1_to_hex(ce->sha1), ce_stage(ce), - needs_cloning, ce->name); + needs_cloning, sub->name, sub->path); string_list_append(&suc->projectlines, sb.buf); if (!needs_cloning) diff --git a/git-submodule.sh b/git-submodule.sh index 4ec7546..e23aada 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -584,11 +584,10 @@ cmd_update() "$@" || echo "#unmatched" } | { err= - while read mode sha1 stage just_cloned sm_path + while read mode sha1 stage just_cloned name sm_path do die_if_unmatched "$mode" - name=$(git submodule--helper name "$sm_path") || exit url=$(git config submodule."$name".url) branch=$(get_submodule_config "$name" branch master) if ! test -z "$update" -- 2.9.2.369.g0e67330 ``` ## Jonathan Nieder, 2016-07-21 01:00 Subject: Re: [PATCH] submodule: do no re-read name in shell script Message-ID: <20160721010029.GG29326@google.com> URL: https://gitlist.dev/e/20160721010029.GG29326%40google.com In-Reply-To: <20160721005122.15966-1-sbeller@google.com> ``` Stefan Beller wrote: > Instead of making another call to a submodule helper (name), just > propagate the value when we know it (in the update-clone helper) already. > > Signed-off-by: Stefan Beller > --- > builtin/submodule--helper.c | 4 ++-- > git-submodule.sh | 3 +-- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c > index b22352b..494e088 100644 > --- a/builtin/submodule--helper.c > +++ b/builtin/submodule--helper.c > @@ -683,9 +683,9 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce, > needs_cloning = !file_exists(sb.buf); > > strbuf_reset(&sb); > - strbuf_addf(&sb, "%06o %s %d %d\t%s\n", ce->ce_mode, > + strbuf_addf(&sb, "%06o %s %d %d %s\t%s\n", ce->ce_mode, > sha1_to_hex(ce->sha1), ce_stage(ce), > - needs_cloning, ce->name); > + needs_cloning, sub->name, sub->path); Are there any restrictions on what characters a submodule name can contain? Does this need e.g. to be quoted with sq_quote? Thanks, Jonathan ``` ## Stefan Beller, 2016-07-21 01:40 Subject: Re: [PATCH] submodule: do no re-read name in shell script Message-ID: URL: https://gitlist.dev/e/CAGZ79kYZphh7f6tf0a7%3D6gKf%2B%3DVg1zO5MdCNypZ0vC8d3Fh7%3DA%40mail.gmail.com In-Reply-To: <20160721010029.GG29326@google.com> ``` On Wed, Jul 20, 2016 at 6:00 PM, Jonathan Nieder wrote: >> - needs_cloning, ce->name); >> + needs_cloning, sub->name, sub->path); > > Are there any restrictions on what characters a submodule name can > contain? Does this need e.g. to be quoted with sq_quote? Oh good point, this ought to fail with weird names. So instead of quoting it, let's just drop this patch. > > Thanks, > Jonathan ```