[PATCH v5 06/17] rebase: convert pre-rebase to use hook.h
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Nov 23, 2021, 11:46 UTC
- Message-ID
- <patch-v5-06.17-d49a1444345-20211123T114206Z-avarab@gmail.com>
- In-Reply-To
- <cover-v5-00.17-00000000000-20211123T114206Z-avarab@gmail.com>
From: Emily Shaffer <emilyshaffer@google.com>
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> --- builtin/rebase.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/builtin/rebase.c b/builtin/rebase.c index 34b4744e5f3..ac4120013a0 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."));
-- 2.34.0.831.gd33babec0d1