From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Jan 2026 20:28:38 +0000 (-0800)
Subject: Revert "Merge branch 'ar/run-command-hook' into next"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5e2cdf65ddc270af6832353964ae41136342966;p=thirdparty%2Fgit.git

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

This reverts commit 236f60e30daed1450cf9c00cce5ac6f736831d37, reversing
changes made to 27a1d947d15ad7e353b8139c095e018f9550e9fe, so that we
can give it a fresh start after 2.53 release.
---

diff --git a/hook.c b/hook.c
index 6b8ddfe7b6..35211e5ed7 100644
--- a/hook.c
+++ b/hook.c
@@ -148,29 +148,28 @@ int run_hooks_opt(struct repository *r, const char *hook_name,
 	};
 	const char *const hook_path = find_hook(r, hook_name);
 	int ret = 0;
-	struct run_process_parallel_opts opts = {
+	const 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_opt");
+		BUG("a struct run_hooks_opt must be provided to run_hooks");
 
 	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;