Merge branch 'ar/run-command-hook' into next

Fix-up a topic that has recently graduated to 'master'.

* ar/run-command-hook:
  hook: check for NULL pointer before deref
This commit is contained in:
Junio C Hamano
2026-01-10 21:54:18 -08:00

11
hook.c
View File

@@ -148,28 +148,29 @@ int run_hooks_opt(struct repository *r, const char *hook_name,
};
const char *const hook_path = find_hook(r, hook_name);
int ret = 0;
const struct run_process_parallel_opts opts = {
struct run_process_parallel_opts opts = {
.tr2_category = "hook",
.tr2_label = hook_name,
.processes = 1,
.ungroup = options->ungroup,
.get_next_task = pick_next_hook,
.start_failure = notify_start_failure,
.feed_pipe = options->feed_pipe,
.consume_output = options->consume_output,
.task_finished = notify_hook_finished,
.data = &cb_data,
};
if (!options)
BUG("a struct run_hooks_opt must be provided to run_hooks");
BUG("a struct run_hooks_opt must be provided to run_hooks_opt");
if (options->path_to_stdin && options->feed_pipe)
BUG("options path_to_stdin and feed_pipe are mutually exclusive");
opts.ungroup = options->ungroup;
opts.feed_pipe = options->feed_pipe;
opts.consume_output = options->consume_output;
if (options->invoked_hook)
*options->invoked_hook = 0;