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 /upload-pack.c | |
| parent | 25666af37bf2998ff5e78c8ac6b92a0708af2f3d (diff) | |
| parent | cc8eb6407e88a46da6d41e18cffed3878f2c53cf (diff) | |
| download | git-5f8a0de98b727b9bfaea0f3318066109fd6745b8.tar.gz git-5f8a0de98b727b9bfaea0f3318066109fd6745b8.tar.xz | |
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 'upload-pack.c')
| -rw-r--r-- | upload-pack.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/upload-pack.c b/upload-pack.c index df151813f..dc464d78b 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -105,12 +105,12 @@ static void show_edge(struct commit *commit) fprintf(pack_pipe, "-%s\n", sha1_to_hex(commit->object.sha1)); } -static int do_rev_list(int fd, void *create_full_pack) +static int do_rev_list(int in, int out, void *create_full_pack) { int i; struct rev_info revs; - pack_pipe = xfdopen(fd, "w"); + pack_pipe = xfdopen(out, "w"); init_revisions(&revs, NULL); revs.tag_objects = 1; revs.tree_objects = 1; @@ -162,8 +162,9 @@ static void create_pack_file(void) int arg = 0; if (shallow_nr) { + memset(&rev_list, 0, sizeof(rev_list)); rev_list.proc = do_rev_list; - rev_list.data = 0; + rev_list.out = -1; if (start_async(&rev_list)) die("git upload-pack: unable to fork git-rev-list"); argv[arg++] = "pack-objects"; |