Merge branch 'ab/hooks-regression-fix'
A follow-up fix to a fix for a regression in 2.36. * ab/hooks-regression-fix: hook API: don't segfault on strbuf_addf() to NULL "out"
This commit is contained in:
7
hook.c
7
hook.c
@ -62,9 +62,6 @@ static int pick_next_hook(struct child_process *cp,
|
||||
strvec_push(&cp->args, hook_path);
|
||||
strvec_pushv(&cp->args, hook_cb->options->args.v);
|
||||
|
||||
/* Provide context for errors if necessary */
|
||||
*pp_task_cb = (char *)hook_path;
|
||||
|
||||
/*
|
||||
* This pick_next_hook() will be called again, we're only
|
||||
* running one hook, so indicate that no more work will be
|
||||
@ -80,13 +77,9 @@ static int notify_start_failure(struct strbuf *out,
|
||||
void *pp_task_cp)
|
||||
{
|
||||
struct hook_cb_data *hook_cb = pp_cb;
|
||||
const char *hook_path = pp_task_cp;
|
||||
|
||||
hook_cb->rc |= 1;
|
||||
|
||||
strbuf_addf(out, _("Couldn't start hook '%s'\n"),
|
||||
hook_path);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user