From: Jacob Keller <jacob.e.keller@intel.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>,
Mark Strapetz <marc.strapetz@syntevo.com>,
Stefan Beller <sbeller@google.com>,
Junio C Hamano <gitster@pobox.com>,
Jacob Keller <jacob.keller@gmail.com>
Subject: [PATCH v6 0/7] submodule--helper credential.* pass into submodule
Date: Mon, 29 Feb 2016 14:58:28 -0800 [thread overview]
Message-ID: <1456786715-24256-1-git-send-email-jacob.e.keller@intel.com> (raw)
From: Jacob Keller <jacob.keller@gmail.com>
This series implements ability to pass the credential.* configuration
variables from the command line directly into the submodule. The other
patches in this series are small fixups noticed along the way.
--> Interdiff between v5 and v6 <--
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 43943eef81b4..3d37c3f1822d 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -140,18 +140,18 @@ static int submodule_config_ok(const char *var)
static int sanitize_submodule_config(const char *var, const char *value, void *data)
{
- struct strbuf quoted = STRBUF_INIT;
struct strbuf *out = data;
if (submodule_config_ok(var)) {
if (out->len)
strbuf_addch(out, ' ');
- sq_quotef(out, "%s=%s", var, value);
+ if (value)
+ sq_quotef(out, "%s=%s", var, value);
+ else
+ sq_quote_buf(out, var);
}
- strbuf_release("ed);
-
return 0;
}
@@ -235,16 +235,17 @@ static int module_clone(int argc, const char **argv, const char *prefix)
const char *const git_submodule_helper_usage[] = {
N_("git submodule--helper clone [--prefix=<path>] [--quiet] "
- "[--reference <repository>] [--name <name>] [--url <url>]"
- "[--depth <depth>] [--path <path>]"),
+ "[--reference <repository>] [--name <name>] [--depth <depth>] "
+ "--url <url> --path <path>"),
NULL
};
argc = parse_options(argc, argv, prefix, module_clone_options,
git_submodule_helper_usage, 0);
- if (argc)
- usage(*git_submodule_helper_usage);
+ if (argc || !url || !path)
+ usage_with_options(git_submodule_helper_usage,
+ module_clone_options);
strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), name);
sm_gitdir = strbuf_detach(&sb, NULL);
Jacob Keller (6):
submodule: don't pass empty string arguments to submodule--helper
clone
submodule: check argc count for git submodule--helper clone
submodule: fix submodule--helper clone usage
submodule: fix segmentation fault in submodule--helper clone
quote: implement sq_quotef()
git: submodule honor -c credential.* from command line
Michael J Gruber (1):
t/lib-httpd: load mod_unixd
builtin/submodule--helper.c | 76 ++++++++++++++++++++++++++++++++++++++++++--
git-submodule.sh | 40 ++++++++++++++---------
quote.c | 13 ++++++++
quote.h | 3 ++
t/lib-httpd/apache.conf | 3 ++
t/t5550-http-fetch-dumb.sh | 17 ++++++++++
t/t7412-submodule--helper.sh | 26 +++++++++++++++
7 files changed, 160 insertions(+), 18 deletions(-)
create mode 100755 t/t7412-submodule--helper.sh
--
2.7.1.429.g45cd78e
next reply other threads:[~2016-02-29 22:58 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 22:58 Jacob Keller [this message]
2016-02-29 22:58 ` [PATCH v6 1/7] t/lib-httpd: load mod_unixd Jacob Keller
2016-02-29 22:58 ` [PATCH v6 2/7] submodule: don't pass empty string arguments to submodule--helper clone Jacob Keller
2016-02-29 23:14 ` Stefan Beller
2016-02-29 22:58 ` [PATCH v6 3/7] submodule: check argc count for git " Jacob Keller
2016-02-29 23:14 ` Stefan Beller
2016-02-29 22:58 ` [PATCH v6 4/7] submodule: fix submodule--helper clone usage Jacob Keller
2016-02-29 23:15 ` Stefan Beller
2016-02-29 22:58 ` [PATCH v6 5/7] submodule: fix segmentation fault in submodule--helper clone Jacob Keller
2016-02-29 23:20 ` Stefan Beller
2016-02-29 23:36 ` Jacob Keller
2016-02-29 22:58 ` [PATCH v6 6/7] quote: implement sq_quotef() Jacob Keller
2016-02-29 22:58 ` [PATCH v6 7/7] git: submodule honor -c credential.* from command line Jacob Keller
2016-02-29 23:39 ` Stefan Beller
2016-02-29 23:44 ` Jacob Keller
2016-03-01 1:36 ` Jeff King
2016-03-01 17:26 ` Junio C Hamano
2016-03-01 18:05 ` Jacob Keller
2016-03-01 19:07 ` Junio C Hamano
2016-03-01 22:03 ` Jacob Keller
2016-03-22 18:56 ` Jonathan Nieder
2016-03-22 19:23 ` Jeff King
2016-03-22 19:50 ` [PATCH] git_config_push_parameter: handle empty GIT_CONFIG_PARAMETERS Jeff King
2016-03-22 20:29 ` Junio C Hamano
2016-03-22 21:43 ` Jonathan Nieder
2016-03-23 0:14 ` Jacob Keller
2016-03-23 20:46 ` Junio C Hamano
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=1456786715-24256-1-git-send-email-jacob.e.keller@intel.com \
--to=jacob.e.keller@intel.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
--cc=marc.strapetz@syntevo.com \
--cc=peff@peff.net \
--cc=sbeller@google.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.
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).