upload-pack: use argv_array for pack_objects
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>
Michael Procter committed
Feb 25, 2016 at 12:13 UTC
65a3629ea3fa91fbf4c434bf25d84ce163aa2360
1 file changed
+11
-14
upload-pack.c
+11
-14
@@ -90,35 +90,32 @@ static void create_pack_file(void)
90
"corruption on the remote side.";
91
int buffered = -1;
92
ssize_t sz;
93
- const char *argv[13];
94
- int i, arg = 0;
93
+ int i;
94
FILE *pipe_fd;
95
96
if (shallow_nr) {
98
- argv[arg++] = "--shallow-file";
99
- argv[arg++] = "";
97
+ argv_array_push(&pack_objects.args, "--shallow-file");
98
+ argv_array_push(&pack_objects.args, "");
99
}
101
- argv[arg++] = "pack-objects";
102
- argv[arg++] = "--revs";
100
+ argv_array_push(&pack_objects.args, "pack-objects");
101
+ argv_array_push(&pack_objects.args, "--revs");
102
if (use_thin_pack)
104
- argv[arg++] = "--thin";
103
+ argv_array_push(&pack_objects.args, "--thin");
104
106
- argv[arg++] = "--stdout";
105
+ argv_array_push(&pack_objects.args, "--stdout");
106
if (shallow_nr)
108
- argv[arg++] = "--shallow";
107
+ argv_array_push(&pack_objects.args, "--shallow");
108
if (!no_progress)
110
- argv[arg++] = "--progress";
109
+ argv_array_push(&pack_objects.args, "--progress");
110
if (use_ofs_delta)
112
- argv[arg++] = "--delta-base-offset";
111
+ argv_array_push(&pack_objects.args, "--delta-base-offset");
112
if (use_include_tag)
114
- argv[arg++] = "--include-tag";
115
- argv[arg++] = NULL;
113
+ argv_array_push(&pack_objects.args, "--include-tag");
114
115
pack_objects.in = -1;
116
pack_objects.out = -1;
117
pack_objects.err = -1;
118
pack_objects.git_cmd = 1;
121
- pack_objects.argv = argv;
119
120
if (start_command(&pack_objects))
121
die("git upload-pack: unable to fork git-pack-objects");