undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebase: convert pre-rebase to use hook.h

Browse Source 
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>
This commit is contained in:
Emily Shaffer 2021-12-22 04:59:32 +01:00 committed by Junio C Hamano
parent ab81cf242c
commit 25d4e02cfc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/rebase.c
View File

@ -28,6 +28,7 @@
#include "sequencer.h" #include "sequencer.h"
#include "rebase-interactive.h" #include "rebase-interactive.h"
#include "reset.h" #include "reset.h"
#include "hook.h"
#define DEFAULT_REFLOG_ACTION "rebase" #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 a hook exists, give it a chance to interrupt*/
if (!ok_to_skip_pre_rebase && 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)) argc ? argv[0] : NULL, NULL))
die(_("The pre-rebase hook refused to rebase.")); die(_("The pre-rebase hook refused to rebase."));