From: Emily Shaffer <emilyshaffer@xxxxxxxxxx>
Signed-off-by: Emily Shaffer <emilyshaffer@xxxxxxxxxx>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx>
---
builtin/am.c | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index 9e9c1b5e9f2..6e4f9c80360 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -467,23 +467,15 @@ static int run_applypatch_msg_hook(struct am_state *state)
*/
static int run_post_rewrite_hook(const struct am_state *state)
{
- struct child_process cp = CHILD_PROCESS_INIT;
- const char *hook = find_hook("post-rewrite");
+ struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
int ret;
- if (!hook)
- return 0;
-
- strvec_push(&cp.args, hook);
- strvec_push(&cp.args, "rebase");
-
- cp.in = xopen(am_path(state, "rewritten"), O_RDONLY);
- cp.stdout_to_stderr = 1;
- cp.trace2_hook_name = "post-rewrite";
+ strvec_push(&opt.args, "rebase");
+ opt.path_to_stdin = am_path(state, "rewritten");
- ret = run_command(&cp);
+ ret = run_hooks("post-rewrite", &opt);
- close(cp.in);
+ run_hooks_opt_clear(&opt);
return ret;
}
--
2.32.0.rc1.458.gd885d4f985c
