From: Emily Shaffer <emilyshaffer@google.com>
To: git@vger.kernel.org
Cc: Emily Shaffer <emilyshaffer@google.com>, Jeff King <peff@peff.net>
Subject: [PATCH v3 0/2] propagate --single-branch during clone --recurse-submodules
Date: Thu, 20 Feb 2020 19:10:25 -0800 [thread overview]
Message-ID: <20200221031027.204486-1-emilyshaffer@google.com> (raw)
In-Reply-To: <20200128221736.9217-1-emilyshaffer@google.com>
Since v2, I replied to Peff's comments, and I also added support to
propagate --no-single-branch. I'm pretty sure I followed the idiom right
to to treat options as "yes, no, unset" but not sure of the best way to
test to feel assured that they're being propagated correctly.
- Emily
Emily Shaffer (2):
submodule--helper: use C99 named initializer
clone: pass --single-branch during --recurse-submodules
Documentation/git-submodule.txt | 6 +++++-
builtin/clone.c | 5 +++++
builtin/submodule--helper.c | 32 +++++++++++++++++++++++-------
git-submodule.sh | 10 +++++++++-
t/t5617-clone-submodules-remote.sh | 13 +++++++++++-
5 files changed, 56 insertions(+), 10 deletions(-)
-: ---------- > 1: d1d69cc9ce submodule--helper: use C99 named initializer
1: e064e805da ! 2: adfe55b18f clone: pass --single-branch during --recurse-submodules
@@ Documentation/git-submodule.txt: If you really want to remove a submodule from t
options.
-update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]::
-+update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--single-branch] [--] [<path>...]::
++update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]::
+
--
Update the registered submodules to match what the superproject
@@ Documentation/git-submodule.txt: options carefully.
Clone new submodules in parallel with as many jobs.
Defaults to the `submodule.fetchJobs` option.
-+--single-branch::
++--[no-]single-branch::
+ This option is only valid for the update command.
-+ Clone only one branch during update, HEAD or --branch.
++ Clone only one branch during update: HEAD or one specified by --branch.
+
<path>...::
Paths to submodule(s). When specified this will restrict the command
@@ builtin/clone.c: static int checkout(int submodule_progress)
argv_array_push(&args, "--no-fetch");
}
-+ if (option_single_branch)
-+ argv_array_push(&args, "--single-branch");
++ if (option_single_branch >= 0)
++ argv_array_push(&args, option_single_branch ?
++ "--single-branch" :
++ "--no-single-branch");
+
err = run_command_v_opt(args.argv, RUN_GIT_CMD);
argv_array_clear(&args);
@@ builtin/submodule--helper.c: static int clone_submodule(const char *path, const
argv_array_push(&cp.args, "--dissociate");
if (gitdir && *gitdir)
argv_array_pushl(&cp.args, "--separate-git-dir", gitdir, NULL);
-+ if (single_branch)
-+ argv_array_push(&cp.args, "--single-branch");
++ if (single_branch >= 0)
++ argv_array_push(&cp.args, single_branch ?
++ "--single-branch" :
++ "--no-single-branch");
argv_array_push(&cp.args, "--");
argv_array_push(&cp.args, url);
@@ builtin/submodule--helper.c: static int module_clone(int argc, const char **argv
struct string_list reference = STRING_LIST_INIT_NODUP;
int dissociate = 0, require_init = 0;
char *sm_alternate = NULL, *error_strategy = NULL;
-+ int single_branch = 0;
++ int single_branch = -1;
struct option module_clone_options[] = {
OPT_STRING(0, "prefix", &prefix,
@@ builtin/submodule--helper.c: struct submodule_update_clone {
/* to be consumed by git-submodule.sh */
struct update_clone_data *update_clone;
@@ builtin/submodule--helper.c: struct submodule_update_clone {
- };
- #define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \
- SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, 0, 0, \
-- NULL, NULL, NULL, \
-+ NULL, NULL, NULL, 0,\
- NULL, 0, 0, 0, NULL, 0, 0, 1}
-
-
+ .update = SUBMODULE_UPDATE_STRATEGY_INIT, \
+ .recommend_shallow = -1, \
+ .references = STRING_LIST_INIT_DUP, \
++ .single_branch = -1, \
+ .max_jobs = 1 \
+ }
+
+-
+ static void next_submodule_warn_missing(struct submodule_update_clone *suc,
+ struct strbuf *out, const char *displaypath)
+ {
@@ builtin/submodule--helper.c: static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
argv_array_push(&child->args, "--dissociate");
if (suc->depth)
argv_array_push(&child->args, suc->depth);
-+ if (suc->single_branch)
-+ argv_array_push(&child->args, "--single-branch");
++ if (suc->single_branch >= 0)
++ argv_array_push(&child->args, suc->single_branch ?
++ "--single-branch" :
++ "--no-single-branch");
cleanup:
strbuf_reset(&displaypath_sb);
@@ git-submodule.sh: USAGE="[--quiet] [--cached]
or: $dashless [--quiet] init [--] [<path>...]
or: $dashless [--quiet] deinit [-f|--force] (--all| [--] <path>...)
- or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--] [<path>...]
-+ or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--single-branch] [--] [<path>...]
++ or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
or: $dashless [--quiet] set-branch (--default|--branch <branch>) [--] <path>
or: $dashless [--quiet] set-url [--] <path> <newurl>
or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
@@ git-submodule.sh: cmd_update()
jobs=$1
;;
+ --single-branch)
-+ single_branch=1
++ single_branch="--single-branch"
++ ;;
++ --no-single-branch)
++ single_branch="--no-single-branch"
+ ;;
--)
shift
@@ git-submodule.sh: cmd_update()
${dissociate:+"--dissociate"} \
${depth:+--depth "$depth"} \
${require_init:+--require-init} \
-+ ${single_branch:+--single-branch} \
++ $single_branch \
$recommend_shallow \
$jobs \
-- \
@@ t/t5617-clone-submodules-remote.sh: test_expect_success 'check the default is --
+ git clone --recurse-submodules --single-branch "file://$pwd/." super_clone &&
+ (
+ cd super_clone/sub &&
-+ git branch -a >branches &&
-+ test_must_fail grep other branches
++ git rev-parse --verify origin/master &&
++ test_must_fail git rev-parse --verify origin/other
+ )
+'
+
--
2.25.0.265.gbab2e86ba0-goog
next prev parent reply other threads:[~2020-02-21 3:10 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-08 23:19 [PATCH] clone: teach --single-branch and --branch during --recurse Emily Shaffer
2020-01-08 23:39 ` Emily Shaffer
2020-01-09 8:11 ` Jeff King
2020-01-16 22:38 ` Emily Shaffer
2020-01-17 21:03 ` Jeff King
2020-01-27 22:20 ` Emily Shaffer
2020-01-27 22:49 ` Emily Shaffer
2020-01-27 23:10 ` Jeff King
2020-01-28 1:08 ` Emily Shaffer
2020-01-28 1:31 ` Jeff King
2020-01-28 2:10 ` Emily Shaffer
2020-01-27 23:00 ` Jeff King
2020-01-28 22:17 ` [PATCH v2] clone: pass --single-branch during --recurse-submodules Emily Shaffer
2020-01-30 10:23 ` Jeff King
2020-02-21 2:53 ` Emily Shaffer
2020-02-21 3:16 ` Jeff King
2020-02-21 3:10 ` Emily Shaffer [this message]
2020-02-21 3:10 ` [PATCH v3 1/2] submodule--helper: use C99 named initializer Emily Shaffer
2020-02-21 5:26 ` Jeff King
2020-02-22 20:13 ` Junio C Hamano
2020-02-21 3:10 ` [PATCH v3 2/2] clone: pass --single-branch during --recurse-submodules Emily Shaffer
2020-02-21 5:28 ` Jeff King
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=20200221031027.204486-1-emilyshaffer@google.com \
--to=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.