summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-09 21:30:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-09 21:30:01 (GMT)
commit711b2769740637e228c8200927e96b31f2065d32 (patch)
tree423a57f9f9edc28bbca1c9d607cae0fa72782884 /builtin
parent01a2a03c56e8d4cd9724b185a48a2a1ea9852f0c (diff)
parent9ba380481cc3a5ae7706763d71cf8844917ed804 (diff)
downloadgit-711b2769740637e228c8200927e96b31f2065d32.zip
git-711b2769740637e228c8200927e96b31f2065d32.tar.gz
git-711b2769740637e228c8200927e96b31f2065d32.tar.bz2
Merge branch 'nd/clone-connectivity-shortcut'
* nd/clone-connectivity-shortcut: smart http: use the same connectivity check on cloning
Diffstat (limited to 'builtin')
-rw-r--r--builtin/fetch-pack.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index aba4465..3e19d71 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -100,6 +100,10 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
pack_lockfile_ptr = &pack_lockfile;
continue;
}
+ if (!strcmp("--check-self-contained-and-connected", arg)) {
+ args.check_self_contained_and_connected = 1;
+ continue;
+ }
usage(fetch_pack_usage);
}
@@ -152,6 +156,11 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
printf("lock %s\n", pack_lockfile);
fflush(stdout);
}
+ if (args.check_self_contained_and_connected &&
+ args.self_contained_and_connected) {
+ printf("connectivity-ok\n");
+ fflush(stdout);
+ }
close(fd[0]);
close(fd[1]);
if (finish_connect(conn))