summaryrefslogtreecommitdiff
path: root/connect.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-12 00:47:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-12 00:47:07 (GMT)
commit40aab8119f38c622f58d8e612e7a632eb1f3ded2 (patch)
treeb7f492f0a23620c8399b073d6cfec9375f1ce470 /connect.c
parente3560df69d5ff8047bb82524ef23f7c08c729b64 (diff)
parentfb32c9172a1f2828d75f5d17d8ceea8ffe692f2a (diff)
downloadgit-40aab8119f38c622f58d8e612e7a632eb1f3ded2.zip
git-40aab8119f38c622f58d8e612e7a632eb1f3ded2.tar.gz
git-40aab8119f38c622f58d8e612e7a632eb1f3ded2.tar.bz2
Merge branch 'db/no-separate-ls-remote-connection' (early part)
* 'db/no-separate-ls-remote-connection' (early part): Fix "git clone" for git:// protocol Reduce the number of connects when fetching
Diffstat (limited to 'connect.c')
-rw-r--r--connect.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/connect.c b/connect.c
index 71597d4..5ac3572 100644
--- a/connect.c
+++ b/connect.c
@@ -474,14 +474,18 @@ char *get_port(char *host)
return NULL;
}
+static struct child_process no_fork;
+
/*
- * This returns NULL if the transport protocol does not need fork(2), or a
- * struct child_process object if it does. Once done, finish the connection
- * with finish_connect() with the value returned from this function
- * (it is safe to call finish_connect() with NULL to support the former
- * case).
+ * This returns a dummy child_process if the transport protocol does not
+ * need fork(2), or a struct child_process object if it does. Once done,
+ * finish the connection with finish_connect() with the value returned from
+ * this function (it is safe to call finish_connect() with NULL to support
+ * the former case).
*
- * If it returns, the connect is successful; it just dies on errors.
+ * If it returns, the connect is successful; it just dies on errors (this
+ * will hopefully be changed in a libification effort, to return NULL when
+ * the connection failed).
*/
struct child_process *git_connect(int fd[2], const char *url_orig,
const char *prog, int flags)
@@ -579,7 +583,7 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
free(url);
if (free_path)
free(path);
- return NULL;
+ return &no_fork;
}
conn = xcalloc(1, sizeof(*conn));
@@ -637,7 +641,7 @@ struct child_process *git_connect(int fd[2], const char *url_orig,
int finish_connect(struct child_process *conn)
{
int code;
- if (!conn)
+ if (!conn || conn == &no_fork)
return 0;
code = finish_command(conn);