run-command API users: use strvec_pushl(), not argv construction
Change a pattern of hardcoding an "argv" array size, populating it and assigning to the "argv" member of "struct child_process" to instead use "strvec_pushl()" to add data to the "args" member. This implements the same behavior as before in fewer lines of code, and moves us further towards being able to remove the "argv" member in a subsequent commit. Since we've entirely removed the "argv" variable(s) we can be sure that no potential logic errors of the type discussed in a preceding commit are being introduced here, i.e. ones where the local "argv" was being modified after the assignment to "struct child_process"'s "argv". Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
87ee87dd6b
commit
2b7098936c
@ -302,15 +302,11 @@ int interactive_add(const char **argv, const char *prefix, int patch)
|
||||
static int edit_patch(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
char *file = git_pathdup("ADD_EDIT.patch");
|
||||
const char *apply_argv[] = { "apply", "--recount", "--cached",
|
||||
NULL, NULL };
|
||||
struct child_process child = CHILD_PROCESS_INIT;
|
||||
struct rev_info rev;
|
||||
int out;
|
||||
struct stat st;
|
||||
|
||||
apply_argv[3] = file;
|
||||
|
||||
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
|
||||
|
||||
if (read_cache() < 0)
|
||||
@ -338,7 +334,8 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
|
||||
die(_("Empty patch. Aborted."));
|
||||
|
||||
child.git_cmd = 1;
|
||||
child.argv = apply_argv;
|
||||
strvec_pushl(&child.args, "apply", "--recount", "--cached", file,
|
||||
NULL);
|
||||
if (run_command(&child))
|
||||
die(_("Could not apply '%s'"), file);
|
||||
|
||||
|
Reference in New Issue
Block a user