builtin/gc: move pruning of worktrees into a separate function
In a subsequent commit we will introduce a new "worktree-prune" task for git-maintenance(1). To prepare for this, refactor the code that spawns `git worktree prune` into a separate function. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
May 7, 2025 at 09:21 UTC
ae76c1c99089903ce2b786a42a7e5598a7be5c5c
1 file changed
+15
-10
builtin/gc.c
+15
-10
@@ -333,6 +333,18 @@ static int maintenance_task_reflog_expire(struct maintenance_run_opts *opts UNUS
333
return run_command(&cmd);
334
}
335
336
+static int maintenance_task_worktree_prune(struct maintenance_run_opts *opts UNUSED,
337
+ struct gc_config *cfg)
338
+{
339
+ struct child_process prune_worktrees_cmd = CHILD_PROCESS_INIT;
340
+
341
+ prune_worktrees_cmd.git_cmd = 1;
342
+ strvec_pushl(&prune_worktrees_cmd.args, "worktree", "prune", "--expire", NULL);
343
+ strvec_push(&prune_worktrees_cmd.args, cfg->prune_worktrees_expire);
344
+
345
+ return run_command(&prune_worktrees_cmd);
346
+}
347
+
348
static int too_many_loose_objects(struct gc_config *cfg)
349
{
350
/*
@@ -913,16 +925,9 @@ int cmd_gc(int argc,
925
}
926
}
927
916
- if (cfg.prune_worktrees_expire) {
917
- struct child_process prune_worktrees_cmd = CHILD_PROCESS_INIT;
918
-
919
- prune_worktrees_cmd.git_cmd = 1;
920
- strvec_pushl(&prune_worktrees_cmd.args, "worktree", "prune", "--expire", NULL);
921
- strvec_push(&prune_worktrees_cmd.args, cfg.prune_worktrees_expire);
922
-
923
- if (run_command(&prune_worktrees_cmd))
924
- die(FAILED_RUN, prune_worktrees_cmd.args.v[0]);
925
- }
928
+ if (cfg.prune_worktrees_expire &&
929
+ maintenance_task_worktree_prune(&opts, &cfg))
930
+ die(FAILED_RUN, "worktree");
931
932
rerere_cmd.git_cmd = 1;
933
strvec_pushl(&rerere_cmd.args, "rerere", "gc", NULL);