Merge branch 'ds/maintenance-part-1'
A "git gc"'s big brother has been introduced to take care of more repository maintenance tasks, not limited to the object database cleaning. * ds/maintenance-part-1: maintenance: add trace2 regions for task execution maintenance: add auto condition for commit-graph task maintenance: use pointers to check --auto maintenance: create maintenance.<task>.enabled config maintenance: take a lock on the objects directory maintenance: add --task option maintenance: add commit-graph task maintenance: initialize task array maintenance: replace run_auto_gc() maintenance: add --quiet option maintenance: create basic maintenance runner
This commit is contained in:
@ -172,7 +172,7 @@ static char *get_split_graph_filename(struct object_directory *odb,
|
||||
oid_hex);
|
||||
}
|
||||
|
||||
static char *get_chain_filename(struct object_directory *odb)
|
||||
char *get_commit_graph_chain_filename(struct object_directory *odb)
|
||||
{
|
||||
return xstrfmt("%s/info/commit-graphs/commit-graph-chain", odb->path);
|
||||
}
|
||||
@ -523,7 +523,7 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r,
|
||||
struct stat st;
|
||||
struct object_id *oids;
|
||||
int i = 0, valid = 1, count;
|
||||
char *chain_name = get_chain_filename(odb);
|
||||
char *chain_name = get_commit_graph_chain_filename(odb);
|
||||
FILE *fp;
|
||||
int stat_res;
|
||||
|
||||
@ -1675,7 +1675,7 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
|
||||
}
|
||||
|
||||
if (ctx->split) {
|
||||
char *lock_name = get_chain_filename(ctx->odb);
|
||||
char *lock_name = get_commit_graph_chain_filename(ctx->odb);
|
||||
|
||||
hold_lock_file_for_update_mode(&lk, lock_name,
|
||||
LOCK_DIE_ON_ERROR, 0444);
|
||||
@ -2045,7 +2045,7 @@ static void expire_commit_graphs(struct write_commit_graph_context *ctx)
|
||||
if (ctx->split_opts && ctx->split_opts->expire_time)
|
||||
expire_time = ctx->split_opts->expire_time;
|
||||
if (!ctx->split) {
|
||||
char *chain_file_name = get_chain_filename(ctx->odb);
|
||||
char *chain_file_name = get_commit_graph_chain_filename(ctx->odb);
|
||||
unlink(chain_file_name);
|
||||
free(chain_file_name);
|
||||
ctx->num_commit_graphs_after = 0;
|
||||
|
||||
Reference in New Issue
Block a user