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: [PATCHv3 0/2] Port `git submodule init` from shell to C
Date: Fri, 22 Jan 2016 15:32:14 -0800 [thread overview]
Message-ID: <1453505536-14895-1-git-send-email-sbeller@google.com> (raw)
In-Reply-To: <xmqqoacdtfh3.fsf@gitster.mtv.corp.google.com>
This applies on top of sb/submodule-parallel-update, replacing
sb/submodule-init.
Fixes:
* a more faithful conversion by staying on stdout (We switch to stderr later
in another series)
* use the existing find_last_dir_sep instead of reinventing the wheel.
Stefan Beller (2):
submodule: port resolve_relative_url from shell to C
submodule: port init from shell to C
builtin/submodule--helper.c | 321 +++++++++++++++++++++++++++++++++++++++++++-
git-submodule.sh | 118 +---------------
t/t0060-path-utils.sh | 42 ++++++
3 files changed, 361 insertions(+), 120 deletions(-)
Interdiff to origin/sb/submodule-init (committed 2016-01-20 12:55:30)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 4684f16..c9b0c05 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -51,21 +51,12 @@ static int starts_with_dot_dot_slash(const char *str)
return str[0] == '.' && str[1] == '.' && is_dir_sep(str[2]);
}
-static char *last_dir_separator(char *str)
-{
- char *p = str + strlen(str);
- while (p-- > str)
- if (is_dir_sep(*p))
- return p;
- return NULL;
-}
-
/*
* Returns 1 if it was the last chop before ':'.
*/
static int chop_last_dir(char **remoteurl, int is_relative)
{
- char *rfind = last_dir_separator(*remoteurl);
+ char *rfind = find_last_dir_sep(*remoteurl);
if (rfind) {
*rfind = '\0';
return 0;
@@ -232,7 +223,7 @@ static void init_submodule(const char *path, const char *prefix, int quiet)
struct strbuf sb = STRBUF_INIT;
char *url = NULL;
const char *upd = NULL;
- const char *displaypath = relative_path(xgetcwd(), prefix, &sb);;
+ const char *displaypath = relative_path(xgetcwd(), prefix, &sb);
/* Only loads from .gitmodules, no overlay with .git/config */
gitmodules_config();
@@ -276,7 +267,7 @@ static void init_submodule(const char *path, const char *prefix, int quiet)
die(_("Failed to register url for submodule path '%s'"),
displaypath);
if (!quiet)
- fprintf(stderr, _("Submodule '%s' (%s) registered for path '%s'\n"),
+ printf(_("Submodule '%s' (%s) registered for path '%s'\n"),
sub->name, url, displaypath);
free(url);
}
--
2.7.0.rc0.45.g0dba895.dirty
next prev parent reply other threads:[~2016-01-22 23:32 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 ` [PATCHv2 " Stefan Beller
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 ` Stefan Beller [this message]
2016-01-25 22:46 ` [PATCHv3 0/2] Port `git submodule init` " 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=1453505536-14895-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).