diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-21 12:00:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-21 12:00:07 -0800 |
| commit | 5f8a0de98b727b9bfaea0f3318066109fd6745b8 (patch) | |
| tree | 0f0647050dea5edcb7bb36ccd298ca6e842def7c /builtin-fetch-pack.c | |
| parent | Merge branch 'jc/checkout-detached' (diff) | |
| parent | Merge branch 'sp/maint-push-sideband' into sp/push-sideband (diff) | |
| download | git-5f8a0de98b727b9bfaea0f3318066109fd6745b8.tar.gz git-5f8a0de98b727b9bfaea0f3318066109fd6745b8.zip | |
Merge branch 'sp/push-sideband'
* sp/push-sideband:
receive-pack: Send internal errors over side-band #2
t5401: Use a bare repository for the remote peer
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
Diffstat (limited to 'builtin-fetch-pack.c')
| -rw-r--r-- | builtin-fetch-pack.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c index 8ed4a6feaa..dbd8b7bcc8 100644 --- a/builtin-fetch-pack.c +++ b/builtin-fetch-pack.c @@ -586,12 +586,12 @@ static int everything_local(struct ref **refs, int nr_match, char **match) return retval; } -static int sideband_demux(int fd, void *data) +static int sideband_demux(int in, int out, void *data) { int *xd = data; - int ret = recv_sideband("fetch-pack", xd[0], fd); - close(fd); + int ret = recv_sideband("fetch-pack", xd[0], out); + close(out); return ret; } @@ -613,6 +613,7 @@ static int get_pack(int xd[2], char **pack_lockfile) */ demux.proc = sideband_demux; demux.data = xd; + demux.out = -1; if (start_async(&demux)) die("fetch-pack: unable to fork off sideband" " demultiplexer"); |