]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ar/parallel-hooks' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Apr 2026 20:58:18 +0000 (13:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Apr 2026 20:58:18 +0000 (13:58 -0700)
* ar/parallel-hooks:
  t1800: test SIGPIPE with parallel hooks
  hook: allow hook.jobs=-1 to use all available CPU cores
  hook: add hook.<event>.enabled switch
  hook: move is_known_hook() to hook.c for wider use
  hook: warn when hook.<friendly-name>.jobs is set
  hook: add per-event jobs config
  hook: add -j/--jobs option to git hook run
  hook: mark non-parallelizable hooks
  hook: allow pre-push parallel execution
  hook: allow parallel hook execution
  hook: parse the hook.jobs config
  config: add a repo_config_get_uint() helper
  repository: fix repo_init() memleak due to missing _clear()

1  2 
Makefile
builtin/checkout.c
builtin/receive-pack.c
meson.build
transport.c

diff --cc Makefile
Simple merge
index 47391d453ffa5435b4abdcf8cac6fa0dff0ac8ab,ac0186a33e559a0ae2e6a9e63ae53373c58d3c1a..4671ff3804aea15a19a2464368e196316f47c6d0
@@@ -29,8 -30,8 +29,9 @@@
  #include "repo-settings.h"
  #include "resolve-undo.h"
  #include "revision.h"
 +#include "sequencer.h"
  #include "setup.h"
+ #include "strvec.h"
  #include "submodule.h"
  #include "symlinks.h"
  #include "trace2.h"
Simple merge
diff --cc meson.build
Simple merge
diff --cc transport.c
Simple merge