]> git.ipfire.org Git - thirdparty/git.git/commitdiff
rebase: convert pre-rebase to use hook.h
authorEmily Shaffer <emilyshaffer@google.com>
Wed, 22 Dec 2021 03:59:32 +0000 (04:59 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 7 Jan 2022 23:19:34 +0000 (15:19 -0800)
Move the pre-rebase hook away from run-command.h to and over to the
new hook.h library.

Since this hook needs arguments introduce a run_hooksl() wrapper, like
run_hooks(), but it takes varargs.

Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c

index 34b4744e5f3b7ccd5c4a215f477a622cfa06e4a0..ac4120013a08fb2f578fd9274dc3c1bbd02dee34 100644 (file)
@@ -28,6 +28,7 @@
 #include "sequencer.h"
 #include "rebase-interactive.h"
 #include "reset.h"
+#include "hook.h"
 
 #define DEFAULT_REFLOG_ACTION "rebase"
 
@@ -1712,7 +1713,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 
        /* If a hook exists, give it a chance to interrupt*/
        if (!ok_to_skip_pre_rebase &&
-           run_hook_le(NULL, "pre-rebase", options.upstream_arg,
+           run_hooks_l("pre-rebase", options.upstream_arg,
                        argc ? argv[0] : NULL, NULL))
                die(_("The pre-rebase hook refused to rebase."));