diff options
| author |  Emily Shaffer <emilyshaffer@google.com> | 2021-12-22 04:59:32 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2022-01-07 15:19:34 -0800 |
| commit | 25d4e02cfc249601081c560590ce2a74aca6de3d (patch) | |
| tree | ceba28b85e4d7f4c13b5eca70b8815db2ddcb7cc | |
| parent | hook API: add a run_hooks_l() wrapper (diff) | |
| download | tgif-25d4e02cfc249601081c560590ce2a74aca6de3d.tar.xz | |
rebase: convert pre-rebase to use hook.h
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>
| -rw-r--r-- | builtin/rebase.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index 34b4744e5f..ac4120013a 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -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.")); |