From: Stefan Beller <sbeller@google.com>
To: gitster@pobox.com
Cc: sunshine@sunshineco.com, git@vger.kernel.org, jrnieder@gmail.com,
johannes.schindelin@gmail.com, Jens.Lehmann@web.de,
peff@peff.net, Stefan Beller <sbeller@google.com>
Subject: [PATCHv6 0/3] submodule--helper: Have some refactoring only patches first
Date: Tue, 8 Sep 2015 11:57:42 -0700 [thread overview]
Message-ID: <1441738665-29493-1-git-send-email-sbeller@google.com> (raw)
Added suggestions from Eric and Junio. Interdiff to v5 below.
Stefan Beller (3):
submodule: Reimplement `module_list` shell function in C
submodule: Reimplement `module_name` shell function in C
submodule: Reimplement `module_clone` shell function in C
.gitignore | 1 +
Makefile | 1 +
builtin.h | 1 +
builtin/submodule--helper.c | 282 ++++++++++++++++++++++++++++++++++++++++++++
git-submodule.sh | 164 +++-----------------------
git.c | 1 +
6 files changed, 301 insertions(+), 149 deletions(-)
create mode 100644 builtin/submodule--helper.c
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 4e30d8e..f4c3eff 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -10,12 +10,16 @@
#include "string-list.h"
#include "run-command.h"
-static const struct cache_entry **ce_entries;
-static int ce_alloc, ce_used;
+struct module_list {
+ const struct cache_entry **entries;
+ int alloc, nr;
+};
+#define MODULE_LIST_INIT { NULL, 0, 0 }
static int module_list_compute(int argc, const char **argv,
- const char *prefix,
- struct pathspec *pathspec)
+ const char *prefix,
+ struct pathspec *pathspec,
+ struct module_list *list)
{
int i, result = 0;
char *max_prefix, *ps_matched = NULL;
@@ -40,12 +44,11 @@ static int module_list_compute(int argc, const char **argv,
if (!S_ISGITLINK(ce->ce_mode) ||
!match_pathspec(pathspec, ce->name, ce_namelen(ce),
- max_prefix_len, ps_matched,
- S_ISGITLINK(ce->ce_mode) | S_ISDIR(ce->ce_mode)))
+ max_prefix_len, ps_matched, 1))
continue;
- ALLOC_GROW(ce_entries, ce_used + 1, ce_alloc);
- ce_entries[ce_used++] = ce;
+ ALLOC_GROW(list->entries, list->nr + 1, list->alloc);
+ list->entries[list->nr++] = ce;
while (i + 1 < active_nr &&
!strcmp(ce->name, active_cache[i + 1]->name))
/*
@@ -68,6 +71,7 @@ static int module_list(int argc, const char **argv, const char *prefix)
{
int i;
struct pathspec pathspec;
+ struct module_list list = MODULE_LIST_INIT;
struct option module_list_options[] = {
OPT_STRING(0, "prefix", &prefix,
@@ -84,13 +88,13 @@ static int module_list(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, module_list_options,
git_submodule_helper_usage, 0);
- if (module_list_compute(argc, argv, prefix, &pathspec) < 0) {
+ if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0) {
printf("#unmatched\n");
return 1;
}
- for (i = 0; i < ce_used; i++) {
- const struct cache_entry *ce = ce_entries[i];
+ for (i = 0; i < list.nr; i++) {
+ const struct cache_entry *ce = list.entries[i];
if (ce_stage(ce))
printf("%06o %s U\t", ce->ce_mode, sha1_to_hex(null_sha1));
@@ -142,10 +146,7 @@ static int clone_submodule(const char *path, const char *gitdir, const char *url
cp.git_cmd = 1;
cp.env = local_repo_env;
-
cp.no_stdin = 1;
- cp.no_stdout = 1;
- cp.no_stderr = 1;
return run_command(&cp);
}
@@ -206,8 +207,7 @@ static int module_clone(int argc, const char **argv, const char *prefix)
if (safe_create_leading_directories_const(path) < 0)
die(_("could not create directory '%s'"), path);
strbuf_addf(&sb, "%s/index", sm_gitdir);
- if (unlink(sb.buf) < 0)
- die_errno(_("failed to delete '%s'"), sm_gitdir);
+ unlink_or_warn(sb.buf);
strbuf_reset(&sb);
}
@@ -218,7 +218,7 @@ static int module_clone(int argc, const char **argv, const char *prefix)
if (path && *path)
strbuf_addf(&sb, "%s/.git", path);
else
- strbuf_addf(&sb, ".git");
+ strbuf_addstr(&sb, ".git");
if (safe_create_leading_directories_const(sb.buf) < 0)
die(_("could not create leading directories of '%s'"), sb.buf);
diff --git a/git-submodule.sh b/git-submodule.sh
index 7cfdc2c..8b0eb9a 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -227,7 +227,7 @@ cmd_add()
shift
;;
--depth=*)
- depth="$1"
+ depth=$1
;;
--)
shift
--
2.5.0.256.g89f8063.dirty
next reply other threads:[~2015-09-08 18:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-08 18:57 Stefan Beller [this message]
2015-09-08 18:57 ` [PATCHv6 1/3] submodule: Reimplement `module_list` shell function in C Stefan Beller
2015-09-08 18:57 ` [PATCHv6 2/3] submodule: Reimplement `module_name` " Stefan Beller
2015-09-08 18:57 ` [PATCHv6 3/3] submodule: Reimplement `module_clone` " 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=1441738665-29493-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=johannes.schindelin@gmail.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--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).