diff options
| author |  Stefan Beller <sbeller@google.com> | 2017-03-24 17:36:04 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-03-27 09:48:18 -0700 |
| commit | d0d7fed1a2522cc82dfa934df0cdd362a66058b1 (patch) | |
| tree | da41d1a1d2eb5542e2e349dad3ab60c05b0b22be | |
| parent | Merge branch 'js/rebase-helper' (diff) | |
| download | tgif-d0d7fed1a2522cc82dfa934df0cdd362a66058b1.tar.xz | |
submodule.c: use argv_array in is_submodule_modified
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>
| -rw-r--r-- | submodule.c | 10 |
1 files 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; |