From: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Date: Tue, 2 Jul 2019 09:11:27 +0000 (+0530)
Subject: sequencer: use argv_array in reset_merge
X-Git-Tag: v2.23.0-rc0~35^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/265ab48f2646605b27e1343ac50efa9763690f04?hp=--cc

sequencer: use argv_array in reset_merge

Avoid using magic numbers for array size and index under `reset_merge`
function. Use `argv_array` instead. This will make code shorter and
easier to extend.

Signed-off-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

265ab48f2646605b27e1343ac50efa9763690f04
diff --git a/sequencer.c b/sequencer.c
index e8779c7cc5..0b858ca8e0 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -2734,13 +2734,18 @@ static int rollback_is_safe(void)
 
 static int reset_merge(const struct object_id *oid)
 {
-	const char *argv[4];	/* reset --merge <arg> + NULL */
+	int ret;
+	struct argv_array argv = ARGV_ARRAY_INIT;
 
-	argv[0] = "reset";
-	argv[1] = "--merge";
-	argv[2] = oid_to_hex(oid);
-	argv[3] = NULL;
-	return run_command_v_opt(argv, RUN_GIT_CMD);
+	argv_array_pushl(&argv, "reset", "--merge", NULL);
+
+	if (!is_null_oid(oid))
+		argv_array_push(&argv, oid_to_hex(oid));
+
+	ret = run_command_v_opt(argv.argv, RUN_GIT_CMD);
+	argv_array_clear(&argv);
+
+	return ret;
 }
 
 static int rollback_single_pick(struct repository *r)