diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-06 05:08:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-06 05:08:53 (GMT) |
| commit | 76d44c8cfda9be1db78884580ab045c421b083fe (patch) | |
| tree | 9ac31805cf463c84b0bd097e5246a1711181323b /upload-pack.c | |
| parent | b0883aa6c77111e88496bd0afe073caf68ab9f99 (diff) | |
| parent | 6d525d389fbef814b11e41f196e6656f2e95f412 (diff) | |
| download | git-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 '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 df15181..dc464d7 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"; |