]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/maintenance-ref-lock' into jch
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Jun 2025 16:49:23 +0000 (09:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Jun 2025 16:49:23 +0000 (09:49 -0700)
"git maintenance" lacked the care "git gc" had to avoid holding
onto the repository lock for too long during packing refs, which
has been remedied.

* ps/maintenance-ref-lock:
  builtin/maintenance: fix locking race when handling "gc" task
  builtin/gc: avoid global state in `gc_before_repack()`
  usage: allow dying without writing an error message
  builtin/maintenance: fix locking race with refs and reflogs tasks
  builtin/maintenance: split into foreground and background tasks
  builtin/maintenance: fix typedef for function pointers
  builtin/maintenance: extract function to run tasks
  builtin/maintenance: stop modifying global array of tasks
  builtin/maintenance: mark "--task=" and "--schedule=" as incompatible
  builtin/maintenance: centralize configuration of explicit tasks
  builtin/gc: drop redundant local variable
  builtin/gc: use designated field initializers for maintenance tasks

1  2 
builtin/fetch.c
builtin/gc.c
builtin/submodule--helper.c
usage.c

diff --cc builtin/fetch.c
Simple merge
diff --cc builtin/gc.c
Simple merge
Simple merge
diff --cc usage.c
Simple merge