mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sp/maint-push-sideband' into sp/push-sideband

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2010-02-05 21:08:53 -08:00
parent b0883aa6c7 6d525d389f
commit 76d44c8cfd
11 changed files with 290 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
remote-curl.c
View File

@ -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");