Hi,
this is the second version of my patch series that fixes how
git-maintenance(1) detaches: instead of letting its child process
git-gc(1) detach, we now optionally ask git-maintenance(1) itself to
detach when running via our auto maintenance mechanism. This fixes
behaviour of git-maintenance(1) when configured to run non-standard
tasks like the "incremental" task.
There is only a single change compared to v1, namely a rewording of the
final commit message. It now clarifies that we really only fix the auto
maintenance behaviour, and the default behaviour of git-maintenance(1)
remains the same when ran by the user.
Patrick Steinhardt (7):
config: fix constness of out parameter for `git_config_get_expiry()`
builtin/gc: refactor to read config into structure
builtin/gc: fix leaking config values
builtin/gc: stop processing log file on signal
builtin/gc: add a `--detach` flag
builtin/maintenance: add a `--detach` flag
run-command: fix detaching when running auto maintenance
Documentation/git-gc.txt | 5 +-
builtin/gc.c | 384 ++++++++++++++++++++++++---------------
config.c | 4 +-
config.h | 2 +-
read-cache.c | 12 +-
run-command.c | 12 +-
t/t5304-prune.sh | 1 +
t/t5616-partial-clone.sh | 6 +-
t/t6500-gc.sh | 39 ++++
t/t7900-maintenance.sh | 82 ++++++++-
10 files changed, 381 insertions(+), 166 deletions(-)
Range-diff against v1:
1: 040453f27f = 1: 040453f27f config: fix constness of out parameter for `git_config_get_expiry()`
2: ff6aa9d7ba = 2: ff6aa9d7ba builtin/gc: refactor to read config into structure
3: 310e361371 = 3: 310e361371 builtin/gc: fix leaking config values
4: 812c61c9b6 = 4: 812c61c9b6 builtin/gc: stop processing log file on signal
5: ca78d3dc7c = 5: ca78d3dc7c builtin/gc: add a `--detach` flag
6: 06dbb73425 = 6: 06dbb73425 builtin/maintenance: add a `--detach` flag
7: 8d6cbae951 ! 7: 6bc170ff05 builtin/maintenance: fix auto-detach with non-standard tasks
@@ Metadata
Author: Patrick Steinhardt <ps@xxxxxx>
## Commit message ##
- builtin/maintenance: fix auto-detach with non-standard tasks
+ run-command: fix detaching when running auto maintenance
In the past, we used to execute `git gc --auto` as part of our automatic
housekeeping routines. As git-gc(1) may require quite some time to
@@ Commit message
housekeeping tasks, stomping on each others feet.
Fix this bug by asking git-gc(1) to not detach when it is being invoked
- via git-maintenance(1). Instead, the latter command now respects a new
+ via git-maintenance(1). Instead, git-maintenance(1) now respects a new
config "maintenance.autoDetach", the equivalent of "gc.autoDetach", and
- detaches itself into the background if not told otherwise. This should
- continue to behave the same for all users which use the git-gc(1) task,
- only. For others though, it means that we now properly perform all tasks
- in the background.
+ detaches itself into the background when running as part of our auto
+ maintenance. This should continue to behave the same for all users which
+ use the git-gc(1) task, only. For others though, it means that we now
+ properly perform all tasks in the background. The default behaviour of
+ git-maintenance(1) when executed by the user does not change, it will
+ remain in the foreground unless they pass the `--detach` option.
Signed-off-by: Patrick Steinhardt <ps@xxxxxx>
--
2.46.0.46.g406f326d27.dirty
