From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Mar 2026 20:07:50 +0000 (-0700)
Subject: Merge branch 'ar/config-hooks' into ar/config-hook-cleanups
X-Git-Tag: v2.54.0-rc1~33^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83677335aea701658b4377ce09b9fe586fad1620;p=thirdparty%2Fgit.git

Merge branch 'ar/config-hooks' into ar/config-hook-cleanups

* ar/config-hooks: (21 commits)
  builtin/receive-pack: avoid spinning no-op sideband async threads
  hook: add -z option to "git hook list"
  hook: allow out-of-repo 'git hook' invocations
  hook: allow event = "" to overwrite previous values
  hook: allow disabling config hooks
  hook: include hooks from the config
  hook: add "git hook list" command
  hook: run a list of hooks to prepare for multihook support
  hook: add internal state alloc/free callbacks
  receive-pack: convert receive hooks to hook API
  receive-pack: convert update hooks to new API
  run-command: poll child input in addition to output
  hook: add jobs option
  reference-transaction: use hook API instead of run-command
  transport: convert pre-push to hook API
  hook: allow separate std[out|err] streams
  hook: convert 'post-rewrite' hook in sequencer.c to hook API
  hook: provide stdin via callback
  run-command: add stdin callback for parallelization
  run-command: add helper for pp child states
  ...
---

83677335aea701658b4377ce09b9fe586fad1620
diff --cc git.c
index 744cb6527e,a9e462ee32..6480ff8373
--- a/git.c
+++ b/git.c
@@@ -586,8 -586,7 +586,8 @@@ static struct cmd_struct commands[] = 
  	{ "grep", cmd_grep, RUN_SETUP_GENTLY },
  	{ "hash-object", cmd_hash_object },
  	{ "help", cmd_help },
 +	{ "history", cmd_history, RUN_SETUP },
- 	{ "hook", cmd_hook, RUN_SETUP },
+ 	{ "hook", cmd_hook, RUN_SETUP_GENTLY },
  	{ "index-pack", cmd_index_pack, RUN_SETUP_GENTLY | NO_PARSEOPT },
  	{ "init", cmd_init_db },
  	{ "init-db", cmd_init_db },