From 795160457db0982c44cc02f66798a35af4d15625 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 2 Jan 2017 16:28:23 +0100 Subject: sequencer (rebase -i): run the post-rewrite hook, if needed Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- sequencer.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'sequencer.c') diff --git a/sequencer.c b/sequencer.c index d7273fd1b3..43ced8db31 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1957,6 +1957,8 @@ cleanup_head_ref: if (!stat(rebase_path_rewritten_list(), &st) && st.st_size > 0) { struct child_process child = CHILD_PROCESS_INIT; + const char *post_rewrite_hook = + find_hook("post-rewrite"); child.in = open(rebase_path_rewritten_list(), O_RDONLY); child.git_cmd = 1; @@ -1965,6 +1967,18 @@ cleanup_head_ref: argv_array_push(&child.args, "--for-rewrite=rebase"); /* we don't care if this copying failed */ run_command(&child); + + if (post_rewrite_hook) { + struct child_process hook = CHILD_PROCESS_INIT; + + hook.in = open(rebase_path_rewritten_list(), + O_RDONLY); + hook.stdout_to_stderr = 1; + argv_array_push(&hook.args, post_rewrite_hook); + argv_array_push(&hook.args, "rebase"); + /* we don't care if this hook failed */ + run_command(&hook); + } } strbuf_release(&buf); -- cgit v1.2.3