| Message ID | 20210311021037.3001235-23-emilyshaffer@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | config-based hooks | expand |
Emily Shaffer <emilyshaffer@google.com> writes: > @@ -1318,6 +1319,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > char *squash_onto_name = NULL; > int reschedule_failed_exec = -1; > int allow_preemptive_ff = 1; > + struct run_hooks_opt hook_opt; > struct option builtin_rebase_options[] = { > OPT_STRING(0, "onto", &options.onto_name, > N_("revision"), > @@ -1431,6 +1433,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > }; > int i; > > + run_hooks_opt_init_async(&hook_opt); > + > if (argc == 2 && !strcmp(argv[1], "-h")) > usage_with_options(builtin_rebase_usage, > builtin_rebase_options); > @@ -2032,9 +2036,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > } > > /* If a hook exists, give it a chance to interrupt*/ > + strvec_pushl(&hook_opt.args, options.upstream_arg, argc ? argv[0] : NULL, NULL); > if (!ok_to_skip_pre_rebase && > - run_hook_le(NULL, "pre-rebase", options.upstream_arg, > - argc ? argv[0] : NULL, NULL)) > + run_hooks("pre-rebase", &hook_opt)) > die(_("The pre-rebase hook refused to rebase.")); This may needlessly populate hook_opt.args even when run_hooks() is not triggered, but that probably is OK. Except for a place or two where we call die(), the exit path from this function after this point all eventually passes ... > if (options.flags & REBASE_DIFFSTAT) { > @@ -2114,6 +2118,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > ret = !!run_specific_rebase(&options, action); > > cleanup: ... this label, so everybody calls opt_clear() at the end, which is good. > + run_hooks_opt_clear(&hook_opt); > strbuf_release(&buf); > strbuf_release(&revisions); > free(options.head_name);
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index 00f88912cd..e3a0375827 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -206,6 +206,9 @@ two parameters. The first parameter is the upstream from which the series was forked. The second parameter is the branch being rebased, and is not set when rebasing the current branch. +Hooks executed during 'pre-rebase' will run in parallel, unless hook.jobs is +configured to 1. + post-checkout ~~~~~~~~~~~~~ diff --git a/builtin/rebase.c b/builtin/rebase.c index de400f9a19..c35b5ba452 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" @@ -1318,6 +1319,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) char *squash_onto_name = NULL; int reschedule_failed_exec = -1; int allow_preemptive_ff = 1; + struct run_hooks_opt hook_opt; struct option builtin_rebase_options[] = { OPT_STRING(0, "onto", &options.onto_name, N_("revision"), @@ -1431,6 +1433,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) }; int i; + run_hooks_opt_init_async(&hook_opt); + if (argc == 2 && !strcmp(argv[1], "-h")) usage_with_options(builtin_rebase_usage, builtin_rebase_options); @@ -2032,9 +2036,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) } /* If a hook exists, give it a chance to interrupt*/ + strvec_pushl(&hook_opt.args, options.upstream_arg, argc ? argv[0] : NULL, NULL); if (!ok_to_skip_pre_rebase && - run_hook_le(NULL, "pre-rebase", options.upstream_arg, - argc ? argv[0] : NULL, NULL)) + run_hooks("pre-rebase", &hook_opt)) die(_("The pre-rebase hook refused to rebase.")); if (options.flags & REBASE_DIFFSTAT) { @@ -2114,6 +2118,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) ret = !!run_specific_rebase(&options, action); cleanup: + run_hooks_opt_clear(&hook_opt); strbuf_release(&buf); strbuf_release(&revisions); free(options.head_name);
By using hook.h instead of run-command.h to run hooks, pre-rebase hooks can now be specified in the config as well as in the hookdir. pre-rebase is not called anywhere besides builtin/rebase.c. Signed-off-by: Emily Shaffer <emilyshaffer@google.com> --- Documentation/githooks.txt | 3 +++ builtin/rebase.c | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)