summaryrefslogtreecommitdiff
path: root/convert.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-06 05:08:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-02-06 05:08:53 (GMT)
commit76d44c8cfda9be1db78884580ab045c421b083fe (patch)
tree9ac31805cf463c84b0bd097e5246a1711181323b /convert.c
parentb0883aa6c77111e88496bd0afe073caf68ab9f99 (diff)
parent6d525d389fbef814b11e41f196e6656f2e95f412 (diff)
downloadgit-76d44c8cfda9be1db78884580ab045c421b083fe.zip
git-76d44c8cfda9be1db78884580ab045c421b083fe.tar.gz
git-76d44c8cfda9be1db78884580ab045c421b083fe.tar.bz2
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 'convert.c')
-rw-r--r--convert.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/convert.c b/convert.c
index 27acce5..4f8fcb7 100644
--- a/convert.c
+++ b/convert.c
@@ -241,7 +241,7 @@ struct filter_params {
const char *cmd;
};
-static int filter_buffer(int fd, void *data)
+static int filter_buffer(int in, int out, void *data)
{
/*
* Spawn cmd and feed the buffer contents through its stdin.
@@ -255,7 +255,7 @@ static int filter_buffer(int fd, void *data)
child_process.argv = argv;
child_process.use_shell = 1;
child_process.in = -1;
- child_process.out = fd;
+ child_process.out = out;
if (start_command(&child_process))
return error("cannot fork to run external filter %s", params->cmd);
@@ -292,6 +292,7 @@ static int apply_filter(const char *path, const char *src, size_t len,
memset(&async, 0, sizeof(async));
async.proc = filter_buffer;
async.data = &params;
+ async.out = -1;
params.src = src;
params.size = len;
params.cmd = cmd;