summaryrefslogtreecommitdiff
path: root/remote-curl.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-05 21:08:53 -0800
committerJunio C Hamano <gitster@pobox.com>2010-02-05 21:08:53 -0800
commit76d44c8cfda9be1db78884580ab045c421b083fe (patch)
tree9ac31805cf463c84b0bd097e5246a1711181323b /remote-curl.c
parentb0883aa6c77111e88496bd0afe073caf68ab9f99 (diff)
parent6d525d389fbef814b11e41f196e6656f2e95f412 (diff)
downloadgit-76d44c8cfda9be1db78884580ab045c421b083fe.tar.gz
Merge branch 'sp/maint-push-sideband' into sp/push-sideband
* sp/maint-push-sideband: receive-pack: Send hook output over side band #2 receive-pack: Wrap status reports inside side-band-64k receive-pack: Refactor how capabilities are shown to the client send-pack: demultiplex a sideband stream with status data run-command: support custom fd-set in async run-command: Allow stderr to be a caller supplied pipe Update git fsck --full short description to mention packs Conflicts: run-command.c
Diffstat (limited to 'remote-curl.c')
-rw-r--r--remote-curl.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/remote-curl.c b/remote-curl.c
index a904164e42..d388120851 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -184,13 +184,13 @@ static struct discovery* discover_refs(const char *service)
return last;
}
-static int write_discovery(int fd, void *data)
+static int write_discovery(int in, int out, void *data)
{
struct discovery *heads = data;
int err = 0;
- if (write_in_full(fd, heads->buf, heads->len) != heads->len)
+ if (write_in_full(out, heads->buf, heads->len) != heads->len)
err = 1;
- close(fd);
+ close(out);
return err;
}
@@ -202,6 +202,7 @@ static struct ref *parse_git_refs(struct discovery *heads)
memset(&async, 0, sizeof(async));
async.proc = write_discovery;
async.data = heads;
+ async.out = -1;
if (start_async(&async))
die("cannot start thread to parse advertised refs");