undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upload-pack: use argv_array for pack_objects

Browse Source 
Use the argv_array in the child_process structure, to avoid having to
manually maintain an array size.

Signed-off-by: Michael Procter <michael@procter.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Procter 2016-02-25 12:13:26 +00:00 committed by Junio C Hamano
parent 326e5bc91e
commit 65a3629ea3
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
upload-pack.c
View File

@ -90,35 +90,32 @@ static void create_pack_file(void)
"corruption on the remote side.";
int buffered = -1;
ssize_t sz;
const char *argv[13];
int i, arg = 0;
int i;
FILE *pipe_fd;
if (shallow_nr) {
argv[arg++] = "--shallow-file";
argv[arg++] = "";
argv_array_push(&pack_objects.args, "--shallow-file");
argv_array_push(&pack_objects.args, "");
}
argv[arg++] = "pack-objects";
argv[arg++] = "--revs";
argv_array_push(&pack_objects.args, "pack-objects");
argv_array_push(&pack_objects.args, "--revs");
if (use_thin_pack)
argv[arg++] = "--thin";
argv_array_push(&pack_objects.args, "--thin");
argv[arg++] = "--stdout";
argv_array_push(&pack_objects.args, "--stdout");
if (shallow_nr)
argv[arg++] = "--shallow";
argv_array_push(&pack_objects.args, "--shallow");
if (!no_progress)
argv[arg++] = "--progress";
argv_array_push(&pack_objects.args, "--progress");
if (use_ofs_delta)
argv[arg++] = "--delta-base-offset";
argv_array_push(&pack_objects.args, "--delta-base-offset");
if (use_include_tag)
argv[arg++] = "--include-tag";
argv[arg++] = NULL;
argv_array_push(&pack_objects.args, "--include-tag");
pack_objects.in = -1;
pack_objects.out = -1;
pack_objects.err = -1;
pack_objects.git_cmd = 1;
pack_objects.argv = argv;
if (start_command(&pack_objects))
die("git upload-pack: unable to fork git-pack-objects");