mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

http: use internal argv_array of struct child_process

Browse Source 
Avoid a strangely magic array size (it's slightly too big) and explicit
index numbers by building the command line for index-pack using the
embedded argv_array of the child_process.  Add the flag -o and its
argument with argv_array_pushl() to make it obvious that they belong
together.  The resulting code is shorter and easier to extend.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe
2017-12-22 12:56:59 +01:00
committed by Junio C Hamano
parent 936d1b9894
commit c7191fa510
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
http.c
View File

@ -2025,7 +2025,6 @@ int finish_http_pack_request(struct http_pack_request *preq)
char *tmp_idx; char *tmp_idx;
size_t len; size_t len;
struct child_process ip = CHILD_PROCESS_INIT; struct child_process ip = CHILD_PROCESS_INIT;
const char *ip_argv[8];
close_pack_index(p); close_pack_index(p);
@ -2041,13 +2040,9 @@ int finish_http_pack_request(struct http_pack_request *preq)
die("BUG: pack tmpfile does not end in .pack.temp?"); die("BUG: pack tmpfile does not end in .pack.temp?");
tmp_idx = xstrfmt("%.*s.idx.temp", (int)len, preq->tmpfile); tmp_idx = xstrfmt("%.*s.idx.temp", (int)len, preq->tmpfile);
ip_argv[0] = "index-pack"; argv_array_push(&ip.args, "index-pack");
ip_argv[1] = "-o"; argv_array_pushl(&ip.args, "-o", tmp_idx, NULL);
ip_argv[2] = tmp_idx; argv_array_push(&ip.args, preq->tmpfile);
ip_argv[3] = preq->tmpfile;
ip_argv[4] = NULL;
ip.argv = ip_argv;
ip.git_cmd = 1; ip.git_cmd = 1;
ip.no_stdin = 1; ip.no_stdin = 1;
ip.no_stdout = 1; ip.no_stdout = 1;