X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=builtin%2Ffetch.c;h=7a4e41cca75b87d3e5a7c4690658d9879777e965;hb=7451aee8e594fe902856a9bf418ca804171f9d19;hp=bdb03ff54c51426f4c814dc7326e62b0bc3576c5;hpb=6b67e0dc068d1bfd07686071b70f60078380666f;p=git.git

diff --git a/builtin/fetch.c b/builtin/fetch.c
index bdb03ff54..7a4e41cca 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -13,6 +13,7 @@
 #include "sigchain.h"
 #include "transport.h"
 #include "submodule.h"
+#include "connected.h"
 
 static const char * const builtin_fetch_usage[] = {
 	"git fetch [<options>] [<repository> [<refspec>...]]",
@@ -345,62 +346,16 @@ static int update_local_ref(struct ref *ref,
 	}
 }
 
-/*
- * The ref_map records the tips of the refs we are fetching. If
- *
- *  $ git rev-list --verify-objects --stdin --not --all
- *
- * (feeding all the refs in ref_map on its standard input) does not
- * error out, that means everything reachable from these updated refs
- * locally exists and is connected to some of our existing refs.
- *
- * Returns 0 if everything is connected, non-zero otherwise.
- */
-static int check_everything_connected(struct ref *ref_map, int quiet)
+static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
 {
-	struct child_process rev_list;
-	const char *argv[] = {"rev-list", "--verify-objects",
-			      "--stdin", "--not", "--all", NULL, NULL};
-	char commit[41];
-	struct ref *ref;
-	int err = 0;
-
-	if (!ref_map)
-		return 0;
-
-	if (quiet)
-		argv[5] = "--quiet";
-
-	memset(&rev_list, 0, sizeof(rev_list));
-	rev_list.argv = argv;
-	rev_list.git_cmd = 1;
-	rev_list.in = -1;
-	rev_list.no_stdout = 1;
-	rev_list.no_stderr = quiet;
-	if (start_command(&rev_list))
-		return error(_("Could not run 'git rev-list'"));
-
-	sigchain_push(SIGPIPE, SIG_IGN);
-
-	memcpy(commit + 40, "\n", 2);
-	for (ref = ref_map; ref; ref = ref->next) {
-		memcpy(commit, sha1_to_hex(ref->old_sha1), 40);
-		if (write_in_full(rev_list.in, commit, 41) < 0) {
-			if (errno != EPIPE && errno != EINVAL)
-				error(_("failed write to rev-list: %s"),
-				      strerror(errno));
-			err = -1;
-			break;
-		}
-	}
-	if (close(rev_list.in)) {
-		error(_("failed to close rev-list's stdin: %s"), strerror(errno));
-		err = -1;
-	}
-
-	sigchain_pop(SIGPIPE);
+	struct ref **rm = cb_data;
+	struct ref *ref = *rm;
 
-	return finish_command(&rev_list) || err;
+	if (!ref)
+		return -1; /* end of the list */
+	*rm = ref->next;
+	hashcpy(sha1, ref->old_sha1);
+	return 0;
 }
 
 static int store_updated_refs(const char *raw_url, const char *remote_name,
@@ -423,7 +378,8 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 	else
 		url = xstrdup("foreign");
 
-	if (check_everything_connected(ref_map, 0))
+	rm = ref_map;
+	if (check_everything_connected(iterate_ref_map, 0, &rm))
 		return error(_("%s did not send all necessary objects\n"), url);
 
 	for (rm = ref_map; rm; rm = rm->next) {
@@ -522,6 +478,8 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
  */
 static int quickfetch(struct ref *ref_map)
 {
+	struct ref *rm = ref_map;
+
 	/*
 	 * If we are deepening a shallow clone we already have these
 	 * objects reachable.  Running rev-list here will return with
@@ -531,7 +489,7 @@ static int quickfetch(struct ref *ref_map)
 	 */
 	if (depth)
 		return -1;
-	return check_everything_connected(ref_map, 1);
+	return check_everything_connected(iterate_ref_map, 1, &rm);
 }
 
 static int fetch_refs(struct transport *transport, struct ref *ref_map)
@@ -882,6 +840,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv)
 {
 	int i;
 	static const char **refs = NULL;
+	struct refspec *refspec;
 	int ref_nr = 0;
 	int exit_code;
 
@@ -922,8 +881,9 @@ static int fetch_one(struct remote *remote, int argc, const char **argv)
 
 	sigchain_push_common(unlock_pack_on_signal);
 	atexit(unlock_pack);
-	exit_code = do_fetch(transport,
-			parse_fetch_refspec(ref_nr, refs), ref_nr);
+	refspec = parse_fetch_refspec(ref_nr, refs);
+	exit_code = do_fetch(transport, refspec, ref_nr);
+	free(refspec);
 	transport_disconnect(transport);
 	transport = NULL;
 	return exit_code;
@@ -946,6 +906,15 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	argc = parse_options(argc, argv, prefix,
 			     builtin_fetch_options, builtin_fetch_usage, 0);
 
+	if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
+		if (recurse_submodules_default) {
+			int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);
+			set_config_fetch_recurse_submodules(arg);
+		}
+		gitmodules_config();
+		git_config(submodule_config, NULL);
+	}
+
 	if (all) {
 		if (argc == 1)
 			die(_("fetch --all does not take a repository argument"));
@@ -981,12 +950,6 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
 		const char *options[10];
 		int num_options = 0;
-		if (recurse_submodules_default) {
-			int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default);
-			set_config_fetch_recurse_submodules(arg);
-		}
-		gitmodules_config();
-		git_config(submodule_config, NULL);
 		add_options_to_argv(&num_options, options);
 		result = fetch_populated_submodules(num_options, options,
 						    submodule_prefix,