From: Junio C Hamano <gitster@pobox.com>
To: "Mahi Kolla via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
Philippe Blain <levraiphilippeblain@gmail.com>,
Mahi Kolla <mahikolla@google.com>,
Emily Shaffer <emilyshaffer@google.com>,
Felipe Contreras <felipe.contreras@gmail.com>,
Mahi Kolla <mkolla2@illinois.edu>
Subject: Re: [PATCH v6] clone: set submodule.recurse=true if submodule.stickyRecursiveClone enabled
Date: Sat, 14 Aug 2021 11:05:41 -0700 [thread overview]
Message-ID: <xmqqy293ucju.fsf@gitster.g> (raw)
In-Reply-To: <pull.1006.v6.git.1628903396783.gitgitgadget@gmail.com> (Mahi Kolla via GitGitGadget's message of "Sat, 14 Aug 2021 01:09:56 +0000")
"Mahi Kolla via GitGitGadget" <gitgitgadget@gmail.com> writes:
> diff --git a/builtin/clone.c b/builtin/clone.c
> index 66fe66679c8..a08d9012243 100644
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -986,6 +986,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
> struct remote *remote;
> int err = 0, complete_refs_before_fetch = 1;
> int submodule_progress;
> + int sticky_recursive_clone;
This variable does not have to be in such a wider scope, I think.
> struct transport_ls_refs_options transport_ls_refs_options =
> TRANSPORT_LS_REFS_OPTIONS_INIT;
> @@ -1130,6 +1131,11 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
> strbuf_detach(&sb, NULL));
> }
Just in this scope, where "struct string_list_item *item" and
"struct strbuf sb" are declared, is where an extra int variable,
which receives the configuration value, needs to exist.
Also, for a variable that is used only to receive value from
git_config_get_bool(), immediately to be used and then never used
again, we do not need such a long and descriptive name.
> + if (!git_config_get_bool("submodule.stickyRecursiveClone", &sticky_recursive_clone)
> + && sticky_recursive_clone) {
> + string_list_append(&option_config, "submodule.recurse=true");
> + }
We do not need {} around a single statement block.
Taken together, perhaps like the attached.
I'll queue the patch posted as-is for now.
Thanks.
diff --git c/builtin/clone.c w/builtin/clone.c
index 66fe66679c..c4e02d2f78 100644
--- c/builtin/clone.c
+++ w/builtin/clone.c
@@ -1114,6 +1114,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
if (option_recurse_submodules.nr > 0) {
struct string_list_item *item;
struct strbuf sb = STRBUF_INIT;
+ int val;
/* remove duplicates */
string_list_sort(&option_recurse_submodules);
@@ -1130,6 +1131,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
strbuf_detach(&sb, NULL));
}
+ if (!git_config_get_bool("submodule.stickyRecursiveClone", &val) &&
+ val)
+ string_list_append(&option_config, "submodule.recurse=true");
+
if (option_required_reference.nr &&
option_optional_reference.nr)
die(_("clone --recursive is not compatible with "
next prev parent reply other threads:[~2021-08-14 18:05 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-02 17:29 [PATCH 0/2] clone: update submodule.recurse in config when using --recurse-submodule Mahi Kolla via GitGitGadget
2021-08-02 17:29 ` [PATCH 1/2] " Mahi Kolla via GitGitGadget
2021-08-02 17:29 ` [PATCH 2/2] " Mahi Kolla via GitGitGadget
2021-08-02 22:38 ` [PATCH v2 0/3] " Mahi Kolla via GitGitGadget
2021-08-02 22:38 ` [PATCH v2 1/3] " Mahi Kolla via GitGitGadget
2021-08-02 22:38 ` [PATCH v2 2/3] " Mahi Kolla via GitGitGadget
2021-08-02 22:38 ` [PATCH v2 3/3] clone test: update whitespace according to style guide Mahi Kolla via GitGitGadget
2021-08-02 23:23 ` [PATCH v3 0/4] clone: update submodule.recurse in config when using --recurse-submodule Mahi Kolla via GitGitGadget
2021-08-02 23:23 ` [PATCH v3 1/4] " Mahi Kolla via GitGitGadget
2021-08-03 3:20 ` Philippe Blain
2021-08-07 3:06 ` Mahi Kolla
2021-08-02 23:23 ` [PATCH v3 2/4] " Mahi Kolla via GitGitGadget
2021-08-02 23:23 ` [PATCH v3 3/4] clone test: update whitespace according to style guide Mahi Kolla via GitGitGadget
2021-08-02 23:23 ` [PATCH v3 4/4] clone: " Mahi Kolla via GitGitGadget
2021-08-03 3:08 ` [PATCH v3 0/4] clone: update submodule.recurse in config when using --recurse-submodule Philippe Blain
2021-08-03 22:41 ` Junio C Hamano
2021-08-09 19:11 ` [PATCH v4] " Mahi Kolla via GitGitGadget
2021-08-09 21:15 ` Junio C Hamano
2021-08-10 7:26 ` Mahi Kolla
2021-08-10 18:36 ` Junio C Hamano
2021-08-10 23:04 ` Philippe Blain
2021-08-10 23:59 ` Mahi Kolla
2021-08-11 5:02 ` Junio C Hamano
2021-08-12 2:46 ` [PATCH v5] clone: set submodule.recurse=true if user enables feature.experimental flag Mahi Kolla via GitGitGadget
2021-08-12 4:20 ` Junio C Hamano
2021-08-12 23:54 ` Emily Shaffer
2021-08-13 3:35 ` Philippe Blain
2021-08-13 4:12 ` Mahi Kolla
2021-08-13 19:53 ` Junio C Hamano
2021-08-13 14:59 ` Junio C Hamano
2021-08-13 4:34 ` Junio C Hamano
2021-08-13 20:23 ` Emily Shaffer
2021-08-13 20:30 ` Junio C Hamano
2021-08-13 20:38 ` Emily Shaffer
2021-08-13 20:48 ` Mahi Kolla
2021-08-13 20:52 ` Junio C Hamano
2021-08-13 17:33 ` Felipe Contreras
2021-08-14 1:09 ` [PATCH v6] clone: set submodule.recurse=true if submodule.stickyRecursiveClone enabled Mahi Kolla via GitGitGadget
2021-08-14 18:05 ` Junio C Hamano [this message]
2021-08-17 23:02 ` Emily Shaffer
2021-08-18 19:57 ` Junio C Hamano
2021-08-18 20:15 ` [PATCH] fixup! " Junio C Hamano
2021-08-19 17:41 ` Emily Shaffer
2021-08-30 20:59 ` Emily Shaffer
2021-08-30 21:23 ` Junio C Hamano
2021-08-18 22:40 ` [PATCH v6] " Philippe Blain
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=xmqqy293ucju.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=emilyshaffer@google.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=levraiphilippeblain@gmail.com \
--cc=mahikolla@google.com \
--cc=mkolla2@illinois.edu \
/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.
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 NNTP newsgroup(s).