From: René Scharfe <l.s.r@web.de>
Date: Sun, 30 Oct 2022 11:49:37 +0000 (+0100)
Subject: sequencer: simplify building argument list in do_exec()
X-Git-Tag: v2.39.0-rc0~38^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=242aa33de0f18bf09dd147401af9b44cf961d532;p=thirdparty%2Fgit.git

sequencer: simplify building argument list in do_exec()

Build child_argv during initialization, taking advantage of the C99
support for initialization expressions that are not compile time
constants.  This avoids the use of a magic index constant and is shorter
and simpler.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
---

diff --git a/sequencer.c b/sequencer.c
index debb2ecbaf..66eedd2c76 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -3558,11 +3558,10 @@ static int error_failed_squash(struct repository *r,
 
 static int do_exec(struct repository *r, const char *command_line)
 {
-	const char *child_argv[] = { NULL, NULL };
+	const char *child_argv[] = { command_line, NULL };
 	int dirty, status;
 
 	fprintf(stderr, _("Executing: %s\n"), command_line);
-	child_argv[0] = command_line;
 	status = run_command_v_opt(child_argv, RUN_USING_SHELL);
 
 	/* force re-reading of the cache */