diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2007-10-19 21:47:53 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-21 01:30:39 -0400 |
| commit | 98158e9cfd2808613f305bf587ce697762c884bb (patch) | |
| tree | 87502b9a44bf4ca790f60ce8639a903e23b4ac7a /builtin-fetch-pack.c | |
| parent | ca5bb5d5390e4ec709ca3e11c451c58a836d4ee6 (diff) | |
| download | git-98158e9cfd2808613f305bf587ce697762c884bb.tar.gz | |
Change git_connect() to return a struct child_process instead of a pid_t.
This prepares the API of git_connect() and finish_connect() to operate on
a struct child_process. Currently, we just use that object as a placeholder
for the pid that we used to return. A follow-up patch will change the
implementation of git_connect() and finish_connect() to make full use
of the object.
Old code had early-return-on-error checks at the calling sites of
git_connect(), but since git_connect() dies on errors anyway, these checks
were removed.
[sp: Corrected style nit of "conn == NULL" to "!conn"]
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'builtin-fetch-pack.c')
| -rw-r--r-- | builtin-fetch-pack.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c index 8f25d509a0..f56592fea7 100644 --- a/builtin-fetch-pack.c +++ b/builtin-fetch-pack.c @@ -762,7 +762,7 @@ struct ref *fetch_pack(struct fetch_pack_args *my_args, { int i, ret; int fd[2]; - pid_t pid; + struct child_process *conn; struct ref *ref; struct stat st; @@ -773,16 +773,14 @@ struct ref *fetch_pack(struct fetch_pack_args *my_args, st.st_mtime = 0; } - pid = git_connect(fd, (char *)dest, uploadpack, + conn = git_connect(fd, (char *)dest, uploadpack, args.verbose ? CONNECT_VERBOSE : 0); - if (pid < 0) - return NULL; if (heads && nr_heads) nr_heads = remove_duplicates(nr_heads, heads); ref = do_fetch_pack(fd, nr_heads, heads, pack_lockfile); close(fd[0]); close(fd[1]); - ret = finish_connect(pid); + ret = finish_connect(conn); if (!ret && nr_heads) { /* If the heads to pull were given, we should have |