From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: Stefan Beller <sbeller@google.com>,
j6t@kdbg.org, sunshine@sunshineco.com, Jens.Lehmann@web.de
Subject: [PATCHv2 0/2] Port `git submodule init` from shell to C
Date: Tue, 19 Jan 2016 18:03:14 -0800 [thread overview]
Message-ID: <1453255396-31942-1-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <xmqqa8o188i0.fsf@gitster.mtv.corp.google.com>
This replaces sb/submodule-init.
As I was crafting another series on top of this series I noticed a two bugs,
so I am resending it fixed.
* honor the quiet setting
* print to stderr instead of stdout. (In the next series we want to
call init_submodule from within update_clone whose stdout is piped into
git-submodule.sh, so stderr is the only way to talk to the user)
Thanks,
Stefan
The interdiff:
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index c7bd38a..fecc9aa 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -226,7 +226,7 @@ static int git_submodule_config(const char *var, const char *value, void *cb)
return parse_submodule_config_option(var, value);
}
-static void init_submodule(const char *path, const char *prefix)
+static void init_submodule(const char *path, const char *prefix, int quiet)
{
const struct submodule *sub;
struct strbuf sb = STRBUF_INIT;
@@ -275,9 +275,9 @@ static void init_submodule(const char *path, const char *prefix)
if (git_config_set(sb.buf, url))
die(_("Failed to register url for submodule path '%s'"),
displaypath);
-
- printf(_("Submodule '%s' (%s) registered for path '%s'\n"),
- sub->name, url, displaypath);
+ if (!quiet)
+ fprintf(stderr, _("Submodule '%s' (%s) registered for path '%s'\n"),
+ sub->name, url, displaypath);
free(url);
}
@@ -325,7 +325,7 @@ static int module_init(int argc, const char **argv, const char *prefix)
die(_("Pass at least one submodule"));
for (i = 0; i < argc; i++)
- init_submodule(argv[i], prefix);
+ init_submodule(argv[i], prefix, quiet);
return 0;
}
Stefan Beller (2):
submodule: port resolve_relative_url from shell to C
submodule: port init from shell to C
builtin/submodule--helper.c | 330 +++++++++++++++++++++++++++++++++++++++++++-
git-submodule.sh | 118 +---------------
t/t0060-path-utils.sh | 42 ++++++
3 files changed, 370 insertions(+), 120 deletions(-)
--
2.7.0.rc0.44.g6033384.dirty
next prev parent reply other threads:[~2016-01-20 2:03 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 23:37 [PATCH 0/2] Port `git submodule init` from shell to C Stefan Beller
2016-01-15 23:37 ` [PATCH 1/2] submodule: Port resolve_relative_url " Stefan Beller
2016-01-15 23:37 ` [PATCH 2/2] submodule: Port init " Stefan Beller
2016-01-19 23:17 ` [PATCH 0/2] Port `git submodule init` " Junio C Hamano
2016-01-20 2:03 ` Stefan Beller [this message]
2016-01-20 2:03 ` [PATCHv2 1/2] submodule: port resolve_relative_url " Stefan Beller
2016-01-22 19:03 ` Johannes Sixt
2016-01-22 20:23 ` Stefan Beller
2016-01-20 2:03 ` [PATCHv2 2/2] submodule: port init " Stefan Beller
2016-01-20 3:24 ` [PATCHv3 " Stefan Beller
2016-01-20 21:01 ` Junio C Hamano
2016-01-20 22:33 ` Stefan Beller
2016-01-20 23:04 ` Junio C Hamano
2016-01-21 23:18 ` [PATCHv4 " Stefan Beller
2016-01-22 22:30 ` Junio C Hamano
2016-01-22 22:32 ` Stefan Beller
2016-01-22 23:32 ` [PATCHv3 0/2] Port `git submodule init` " Stefan Beller
2016-01-25 22:46 ` Junio C Hamano
2016-01-28 2:30 ` [PATCHv4 " Stefan Beller
2016-01-28 2:30 ` [PATCHv4 1/2] submodule: port resolve_relative_url " Stefan Beller
2016-01-28 22:03 ` Junio C Hamano
2016-01-28 22:11 ` Stefan Beller
2016-01-28 2:30 ` [PATCHv4 2/2] submodule: port init " Stefan Beller
2016-02-27 8:30 ` Duy Nguyen
2016-01-22 23:32 ` [PATCHv3 1/2] submodule: port resolve_relative_url " Stefan Beller
2016-01-22 23:32 ` [PATCHv3 2/2] submodule: port init " Stefan Beller
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=1453255396-31942-1-git-send-email-sbeller@google.com \
--to=sbeller@google.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=sunshine@sunshineco.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).