From: Stefan Beller Date: Sat, 25 Mar 2017 00:36:04 GMT Subject: [PATCH 1/7] submodule.c: use argv_array in is_submodule_modified Message-ID: <20170325003610.15282-2-sbeller@google.com> In-Reply-To: <20170325003610.15282-1-sbeller@google.com> struct argv_array is easier to use and maintain. Signed-off-by: Stefan Beller Reviewed-by: Jonathan Nieder --- submodule.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/submodule.c b/submodule.c index 3200b7bb2b..2c667ac95a 100644 --- a/submodule.c +++ b/submodule.c @@ -1043,12 +1043,6 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked) { ssize_t len; struct child_process cp = CHILD_PROCESS_INIT; - const char *argv[] = { - "status", - "--porcelain", - NULL, - NULL, - }; struct strbuf buf = STRBUF_INIT; unsigned dirty_submodule = 0; const char *line, *next_line; @@ -1066,10 +1060,10 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked) } strbuf_reset(&buf); + argv_array_pushl(&cp.args, "status", "--porcelain", NULL); if (ignore_untracked) - argv[2] = "-uno"; + argv_array_push(&cp.args, "-uno"); - cp.argv = argv; prepare_submodule_repo_env(&cp.env_array); cp.git_cmd = 1; cp.no_stdin = 1; -- 2.12.0.rc1.49.gdeb397943c.dirty