mirror of
https://github.com/git/git.git
synced 2026-01-10 18:20:27 +00:00
hook: allow overriding the ungroup option
When calling run_process_parallel() in run_hooks_opt(), the ungroup option is currently hardcoded to .ungroup = 1. This causes problems when ungrouping should be disabled, for example when sideband-reading collated output from child hooks, because sideband-reading and ungrouping are mutually exclusive. Thus a new hook.h option is added to allow overriding. The existing ungroup=1 behavior is preserved in the run_hooks() API and the "hook run" command. We could modify these to take an option if necessary, so I added two code comments there. Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
7a7717427e
commit
857f047e40
3
commit.c
3
commit.c
@@ -1965,6 +1965,9 @@ int run_commit_hook(int editor_is_used, const char *index_file,
|
||||
strvec_push(&opt.args, arg);
|
||||
va_end(args);
|
||||
|
||||
/* All commit hook use-cases require ungrouping child output. */
|
||||
opt.ungroup = 1;
|
||||
|
||||
opt.invoked_hook = invoked_hook;
|
||||
return run_hooks_opt(the_repository, name, &opt);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user