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

submodule: modernize ok_to_remove_submodule to use argv_array

Browse Source 
Instead of constructing the NULL terminated array ourselves, we
should make use of the argv_array infrastructure.

While at it, adapt the error messages to reflect the actual invocation.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2016-12-20 15:20:10 -08:00 committed by Junio C Hamano
parent bd26756112
commit 5a1c824f70
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
submodule.c
View File

@ -1023,13 +1023,6 @@ int ok_to_remove_submodule(const char *path)
{ {
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",
"-u",
"--ignore-submodules=none",
NULL,
};
struct strbuf buf = STRBUF_INIT; struct strbuf buf = STRBUF_INIT;
int ok_to_remove = 1; int ok_to_remove = 1;
@ -1039,14 +1032,15 @@ int ok_to_remove_submodule(const char *path)
if (!submodule_uses_gitfile(path)) if (!submodule_uses_gitfile(path))
return 0; return 0;
cp.argv = argv; argv_array_pushl(&cp.args, "status", "--porcelain", "-u",
"--ignore-submodules=none", NULL);
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;
cp.out = -1; cp.out = -1;
cp.dir = path; cp.dir = path;
if (start_command(&cp)) if (start_command(&cp))
die("Could not run 'git status --porcelain -uall --ignore-submodules=none' in submodule %s", path); die(_("could not run 'git status --porcelain -u --ignore-submodules=none' in submodule %s"), path);
len = strbuf_read(&buf, cp.out, 1024); len = strbuf_read(&buf, cp.out, 1024);
if (len > 2) if (len > 2)
@ -1054,7 +1048,7 @@ int ok_to_remove_submodule(const char *path)
close(cp.out); close(cp.out);
if (finish_command(&cp)) if (finish_command(&cp))
die("'git status --porcelain -uall --ignore-submodules=none' failed in submodule %s", path); die(_("'git status --porcelain -u --ignore-submodules=none' failed in submodule %s"), path);
strbuf_release(&buf); strbuf_release(&buf);
return ok_to_remove; return ok_to_remove;