[PATCHv4 0/2] Port `git submodule init` from shell to C

From

Stefan Beller <sbeller@google.com>

Date

Jan 28, 2016, 02:30 UTC

Message-ID

<1453948237-9860-1-git-send-email-sbeller@google.com>

In-Reply-To

<xmqqtwm1e0ps.fsf@gitster.mtv.corp.google.com>

Hi,

This applies on top of sb/submodule-parallel-update

Interdiff to v3:

diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index c9b0c05..dd8b2a5 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -35,7 +35,7 @@ static char *get_default_remote(void)
 	if (git_config_get_string(sb.buf, &dest))
 		ret = xstrdup("origin");
 	else
-		ret = xstrdup(dest);
+		ret = dest;
 
 	strbuf_release(&sb);
 	return ret;
@@ -188,6 +188,7 @@ static int resolve_relative_url(int argc, const char **argv, const char *prefix)
 	res = relative_url(remoteurl, url, up_path);
 	puts(res);
 	free(res);
+	free(remoteurl);
 	return 0;
 }
 
@@ -209,6 +210,7 @@ static int resolve_relative_url_test(int argc, const char **argv, const char *pr
 	res = relative_url(remoteurl, url, up_path);
 	puts(res);
 	free(res);
+	free(remoteurl);
 	return 0;
 }
 
@@ -222,8 +224,9 @@ static void init_submodule(const char *path, const char *prefix, int quiet)
 	const struct submodule *sub;
 	struct strbuf sb = STRBUF_INIT;
 	char *url = NULL;
-	const char *upd = NULL;
-	const char *displaypath = relative_path(xgetcwd(), prefix, &sb);
+	char *upd = NULL;
+	char *cwd = xgetcwd();
+	const char *displaypath = relative_path(cwd, prefix, &sb);
 
 	/* Only loads from .gitmodules, no overlay with .git/config */
 	gitmodules_config();
@@ -261,6 +264,7 @@ static void init_submodule(const char *path, const char *prefix, int quiet)
 				remoteurl = xgetcwd();
 			url = relative_url(remoteurl, url, NULL);
 			strbuf_release(&remotesb);
+			free(remoteurl);
 		}
 
 		if (git_config_set(sb.buf, url))
@@ -269,26 +273,27 @@ static void init_submodule(const char *path, const char *prefix, int quiet)
 		if (!quiet)
 			printf(_("Submodule '%s' (%s) registered for path '%s'\n"),
 				sub->name, url, displaypath);
-		free(url);
 	}
 
 	/* Copy "update" setting when it is not set yet */
 	strbuf_reset(&sb);
 	strbuf_addf(&sb, "submodule.%s.update", sub->name);
-	if (git_config_get_string_const(sb.buf, &upd) && sub->update) {
-		upd = sub->update;
+	if (git_config_get_string(sb.buf, &upd) && sub->update) {
+		upd = xstrdup(sub->update);
 		if (strcmp(sub->update, "checkout") &&
 		    strcmp(sub->update, "rebase") &&
 		    strcmp(sub->update, "merge") &&
 		    strcmp(sub->update, "none")) {
 			fprintf(stderr, _("warning: unknown update mode '%s' suggested for submodule '%s'\n"),
 				upd, sub->name);
-			upd = "none";
+			upd = xstrdup("none");
 		}
 		if (git_config_set(sb.buf, upd))
 			die(_("Failed to register update mode for submodule path '%s'"), displaypath);
 	}
 	strbuf_release(&sb);
+	free(cwd);
+	free(upd);
+	free(url);
 }
 
 static int module_init(int argc, const char **argv, const char *prefix)


Stefan Beller (2):
  submodule: port resolve_relative_url from shell to C
  submodule: port init from shell to C

 builtin/submodule--helper.c | 326 +++++++++++++++++++++++++++++++++++++++++++-
 git-submodule.sh            | 118 +---------------
 t/t0060-path-utils.sh       |  42 ++++++
 3 files changed, 366 insertions(+), 120 deletions(-)

-- 
2.7.0.rc0.42.ge5f5e2d