kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

builtin/gc: remove global variables where it trivial to do 

We use a couple of global variables to assemble command line arguments
for subprocesses we execute in git-gc(1). All of these variables except
the one for git-repack(1) are only used in a single place though, so
they don't really add anything but confusion.

Remove those variables.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt 2025-04-30 12:25:06 +02:00 committed by Junio C Hamano
parent 8ab5345241
commit 0c80072063
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
builtin/gc.c
View File

@ -52,15 +52,9 @@ static const char * const builtin_gc_usage[] = {
};

static timestamp_t gc_log_expire_time;

static struct strvec repack = STRVEC_INIT;
static struct strvec prune = STRVEC_INIT;
static struct strvec prune_worktrees = STRVEC_INIT;
static struct strvec rerere = STRVEC_INIT;

static struct tempfile *pidfile;
static struct lock_file log_lock;

static struct string_list pack_garbage = STRING_LIST_INIT_DUP;

static void clean_pack_garbage(void)
@ -779,9 +773,6 @@ int cmd_gc(int argc,
builtin_gc_usage, builtin_gc_options);

strvec_pushl(&repack, "repack", "-d", "-l", NULL);
strvec_pushl(&prune, "prune", "--expire", NULL);
strvec_pushl(&prune_worktrees, "worktree", "prune", "--expire", NULL);
strvec_pushl(&rerere, "rerere", "gc", NULL);

gc_config(&cfg);

@ -907,34 +898,36 @@ int cmd_gc(int argc,
if (cfg.prune_expire) {
struct child_process prune_cmd = CHILD_PROCESS_INIT;

strvec_pushl(&prune_cmd.args, "prune", "--expire", NULL);
/* run `git prune` even if using cruft packs */
strvec_push(&prune, cfg.prune_expire);
strvec_push(&prune_cmd.args, cfg.prune_expire);
if (quiet)
strvec_push(&prune, "--no-progress");
strvec_push(&prune_cmd.args, "--no-progress");
if (repo_has_promisor_remote(the_repository))
strvec_push(&prune,
strvec_push(&prune_cmd.args,
"--exclude-promisor-objects");
prune_cmd.git_cmd = 1;
strvec_pushv(&prune_cmd.args, prune.v);

if (run_command(&prune_cmd))
die(FAILED_RUN, prune.v[0]);
die(FAILED_RUN, prune_cmd.args.v[0]);
}
}

if (cfg.prune_worktrees_expire) {
struct child_process prune_worktrees_cmd = CHILD_PROCESS_INIT;

strvec_push(&prune_worktrees, cfg.prune_worktrees_expire);
prune_worktrees_cmd.git_cmd = 1;
strvec_pushv(&prune_worktrees_cmd.args, prune_worktrees.v);
strvec_pushl(&prune_worktrees_cmd.args, "worktree", "prune", "--expire", NULL);
strvec_push(&prune_worktrees_cmd.args, cfg.prune_worktrees_expire);

if (run_command(&prune_worktrees_cmd))
die(FAILED_RUN, prune_worktrees.v[0]);
die(FAILED_RUN, prune_worktrees_cmd.args.v[0]);
}

rerere_cmd.git_cmd = 1;
strvec_pushv(&rerere_cmd.args, rerere.v);
strvec_pushl(&rerere_cmd.args, "rerere", "gc", NULL);
if (run_command(&rerere_cmd))
die(FAILED_RUN, rerere.v[0]);
die(FAILED_RUN, rerere_cmd.args.v[0]);

report_garbage = report_pack_garbage;
reprepare_packed_git(the_repository);