averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-26 10:53:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

run-command: wean auto_maintenance() functions off the_repository

Browse Source 
The prepare_auto_maintenance() relies on the_repository to read
configurations. Since run_auto_maintenance() calls
prepare_auto_maintenance(), it also implicitly depends the_repository.

Add 'struct repository *' as a parameter to both functions and update
all callers to pass the_repository.

With no global repository dependencies left in this file, remove the
USE_THE_REPOSITORY_VARIABLE macro.

Suggested-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Burak Kaan Karaçay <bkkaracay@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Burak Kaan Karaçay
2026-03-12 17:44:37 +03:00
committed by Junio C Hamano
parent 05c324b92f
commit 9df3be8e2e
8 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/am.c
View File

@@ -1937,7 +1937,7 @@ next:
*/
if (!state->rebasing) {
am_destroy(state);
run_auto_maintenance(state->quiet);
run_auto_maintenance(the_repository, state->quiet);
}
}

2
builtin/commit.c
View File

@@ -1958,7 +1958,7 @@ int cmd_commit(int argc,
git_test_write_commit_graph_or_die(the_repository->objects->sources);
repo_rerere(the_repository, 0);
run_auto_maintenance(quiet);
run_auto_maintenance(the_repository, quiet);
run_commit_hook(use_editor, repo_get_index_file(the_repository),
NULL, "post-commit", NULL);
if (amend && !no_post_rewrite) {

2
builtin/fetch.c
View File

@@ -2873,7 +2873,7 @@ int cmd_fetch(int argc,
if (opt_val != 0)
git_config_push_parameter("maintenance.incremental-repack.auto=-1");
}
run_auto_maintenance(verbosity < 0);
run_auto_maintenance(the_repository, verbosity < 0);
}
cleanup:

2
builtin/merge.c
View File

@@ -506,7 +506,7 @@ static void finish(struct commit *head_commit,
* We ignore errors in 'gc --auto', since the
* user should see them.
*/
run_auto_maintenance(verbosity < 0);
run_auto_maintenance(the_repository, verbosity < 0);
}
}
if (new_head && show_diffstat) {

4
builtin/rebase.c
View File

@@ -562,7 +562,9 @@ static int finish_rebase(struct rebase_options *opts)
* We ignore errors in 'git maintenance run --auto', since the
* user should see them.
*/
run_auto_maintenance(!(opts->flags & (REBASE_NO_QUIET|REBASE_VERBOSE)));
run_auto_maintenance(the_repository,
!(opts->flags & (REBASE_NO_QUIET|REBASE_VERBOSE)));
if (opts->type == REBASE_MERGE) {
struct replay_opts replay = REPLAY_OPTS_INIT;

2
builtin/receive-pack.c
View File

@@ -2727,7 +2727,7 @@ int cmd_receive_pack(int argc,
if (auto_gc) {
struct child_process proc = CHILD_PROCESS_INIT;
if (prepare_auto_maintenance(1, &proc)) {
if (prepare_auto_maintenance(the_repository, 1, &proc)) {
proc.no_stdin = 1;
proc.stdout_to_stderr = 1;
proc.err = use_sideband ? -1 : 0;

16
run-command.c
View File

@@ -1,4 +1,3 @@
#define USE_THE_REPOSITORY_VARIABLE
#define DISABLE_SIGN_COMPARE_WARNINGS
#include "git-compat-util.h"
@@ -1937,11 +1936,12 @@ void run_processes_parallel(const struct run_process_parallel_opts *opts)
trace2_region_leave(tr2_category, tr2_label, NULL);
}
int prepare_auto_maintenance(int quiet, struct child_process *maint)
int prepare_auto_maintenance(struct repository *r, int quiet,
struct child_process *maint)
{
int enabled, auto_detach;
if (!repo_config_get_bool(the_repository, "maintenance.auto", &enabled) &&
if (!repo_config_get_bool(r, "maintenance.auto", &enabled) &&
!enabled)
return 0;
@@ -1950,12 +1950,12 @@ int prepare_auto_maintenance(int quiet, struct child_process *maint)
* honoring `gc.autoDetach`. This is somewhat weird, but required to
* retain behaviour from when we used to run git-gc(1) here.
*/
if (repo_config_get_bool(the_repository, "maintenance.autodetach", &auto_detach) &&
repo_config_get_bool(the_repository, "gc.autodetach", &auto_detach))
if (repo_config_get_bool(r, "maintenance.autodetach", &auto_detach) &&
repo_config_get_bool(r, "gc.autodetach", &auto_detach))
auto_detach = git_env_bool("GIT_TEST_MAINT_AUTO_DETACH", true);
maint->git_cmd = 1;
maint->odb_to_close = the_repository->objects;
maint->odb_to_close = r->objects;
strvec_pushl(&maint->args, "maintenance", "run", "--auto", NULL);
strvec_push(&maint->args, quiet ? "--quiet" : "--no-quiet");
strvec_push(&maint->args, auto_detach ? "--detach" : "--no-detach");
@@ -1963,10 +1963,10 @@ int prepare_auto_maintenance(int quiet, struct child_process *maint)
return 1;
}
int run_auto_maintenance(int quiet)
int run_auto_maintenance(struct repository *r, int quiet)
{
struct child_process maint = CHILD_PROCESS_INIT;
if (!prepare_auto_maintenance(quiet, &maint))
if (!prepare_auto_maintenance(r, quiet, &maint))
return 0;
return run_command(&maint);
}

7
run-command.h
View File

@@ -5,6 +5,8 @@
#include "strvec.h"
struct repository;
/**
* The run-command API offers a versatile tool to run sub-processes with
* redirected input and output as well as with a modified environment
@@ -227,12 +229,13 @@ int run_command(struct child_process *);
* process has been prepared and is ready to run, or 0 in case auto-maintenance
* should be skipped.
*/
int prepare_auto_maintenance(int quiet, struct child_process *maint);
int prepare_auto_maintenance(struct repository *r, int quiet,
struct child_process *maint);
/*
* Trigger an auto-gc
*/
int run_auto_maintenance(int quiet);
int run_auto_maintenance(struct repository *r, int quiet);
/**
* Execute the given command, sending "in" to its stdin, and capturing its