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

submodule.c: use argv_array in is_submodule_modified

Browse Source 
struct argv_array is easier to use and maintain.

Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2017-03-24 17:36:04 -07:00 committed by Junio C Hamano
parent f364f02724
commit d0d7fed1a2
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
submodule.c
View File

@ -1043,12 +1043,6 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
{ {
ssize_t len; ssize_t len;
struct child_process cp = CHILD_PROCESS_INIT; struct child_process cp = CHILD_PROCESS_INIT;
const char *argv[] = {
"status",
"--porcelain",
NULL,
NULL,
};
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
unsigned dirty_submodule = 0; unsigned dirty_submodule = 0;
const char *line, *next_line; const char *line, *next_line;
@ -1066,10 +1060,10 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
} }
strbuf_reset(&buf); strbuf_reset(&buf);
argv_array_pushl(&cp.args, "status", "--porcelain", NULL);
if (ignore_untracked) if (ignore_untracked)
argv[2] = "-uno"; argv_array_push(&cp.args, "-uno");
cp.argv = argv;
prepare_submodule_repo_env(&cp.env_array); prepare_submodule_repo_env(&cp.env_array);
cp.git_cmd = 1; cp.git_cmd = 1;
cp.no_stdin = 1; cp.no_stdin = 1;