diff --git a/run-command.c b/run-command.c
index 2ee59acdc8..afcda96f1d 100644
--- a/run-command.c
+++ b/run-command.c
@@ -1343,7 +1343,8 @@ const char *find_hook(const char *name)
 	return path.buf;
 }
 
-int run_hook_ve(const char *const *env, const char *name, va_list args)
+int run_hook_strvec(const char *const *env, const char *name,
+		    struct strvec *argv)
 {
 	struct child_process hook = CHILD_PROCESS_INIT;
 	const char *p;
@@ -1353,8 +1354,7 @@ int run_hook_ve(const char *const *env, const char *name, va_list args)
 		return 0;
 
 	strvec_push(&hook.args, p);
-	while ((p = va_arg(args, const char *)))
-		strvec_push(&hook.args, p);
+	strvec_pushv(&hook.args, argv->v);
 	hook.env = env;
 	hook.no_stdin = 1;
 	hook.stdout_to_stderr = 1;
@@ -1363,6 +1363,20 @@ int run_hook_ve(const char *const *env, const char *name, va_list args)
 	return run_command(&hook);
 }
 
+int run_hook_ve(const char *const *env, const char *name, va_list args)
+{
+	struct strvec argv = STRVEC_INIT;
+	const char *p;
+	int ret;
+
+	while ((p = va_arg(args, const char *)))
+		strvec_push(&argv, p);
+
+	ret = run_hook_strvec(env, name, &argv);
+	strvec_clear(&argv);
+	return ret;
+}
+
 int run_hook_le(const char *const *env, const char *name, ...)
 {
 	va_list args;
diff --git a/run-command.h b/run-command.h
index 6472b38bde..d6d6b850fd 100644
--- a/run-command.h
+++ b/run-command.h
@@ -217,6 +217,8 @@ const char *find_hook(const char *name);
 LAST_ARG_MUST_BE_NULL
 int run_hook_le(const char *const *env, const char *name, ...);
 int run_hook_ve(const char *const *env, const char *name, va_list args);
+int run_hook_strvec(const char *const *env, const char *name,
+		    struct strvec *argv);
 
 /*
  * Trigger an auto-gc