mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'nd/daemonize-gc' into maint
"git gc --auto" was recently changed to run in the background to give control back early to the end-user sitting in front of the terminal, but it forgot that housekeeping involving reflogs should be done without other processes competing for accesses to the refs. * nd/daemonize-gc: gc --auto: do not lock refs in the background
This commit is contained in:
commit
94c734a607
26
builtin/gc.c
26
builtin/gc.c
|
@ -26,6 +26,7 @@ static const char * const builtin_gc_usage[] = {
|
|||
};
|
||||
|
||||
static int pack_refs = 1;
|
||||
static int prune_reflogs = 1;
|
||||
static int aggressive_depth = 250;
|
||||
static int aggressive_window = 250;
|
||||
static int gc_auto_threshold = 6700;
|
||||
|
@ -258,6 +259,19 @@ static const char *lock_repo_for_gc(int force, pid_t* ret_pid)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static int gc_before_repack(void)
|
||||
{
|
||||
if (pack_refs && run_command_v_opt(pack_refs_cmd.argv, RUN_GIT_CMD))
|
||||
return error(FAILED_RUN, pack_refs_cmd.argv[0]);
|
||||
|
||||
if (prune_reflogs && run_command_v_opt(reflog.argv, RUN_GIT_CMD))
|
||||
return error(FAILED_RUN, reflog.argv[0]);
|
||||
|
||||
pack_refs = 0;
|
||||
prune_reflogs = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int cmd_gc(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
int aggressive = 0;
|
||||
|
@ -320,12 +334,15 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
|
|||
fprintf(stderr, _("Auto packing the repository for optimum performance.\n"));
|
||||
fprintf(stderr, _("See \"git help gc\" for manual housekeeping.\n"));
|
||||
}
|
||||
if (detach_auto)
|
||||
if (detach_auto) {
|
||||
if (gc_before_repack())
|
||||
return -1;
|
||||
/*
|
||||
* failure to daemonize is ok, we'll continue
|
||||
* in foreground
|
||||
*/
|
||||
daemonize();
|
||||
}
|
||||
} else
|
||||
add_repack_all_option();
|
||||
|
||||
|
@ -337,11 +354,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
|
|||
name, (uintmax_t)pid);
|
||||
}
|
||||
|
||||
if (pack_refs && run_command_v_opt(pack_refs_cmd.argv, RUN_GIT_CMD))
|
||||
return error(FAILED_RUN, pack_refs_cmd.argv[0]);
|
||||
|
||||
if (run_command_v_opt(reflog.argv, RUN_GIT_CMD))
|
||||
return error(FAILED_RUN, reflog.argv[0]);
|
||||
if (gc_before_repack())
|
||||
return -1;
|
||||
|
||||
if (run_command_v_opt(repack.argv, RUN_GIT_CMD))
|
||||
return error(FAILED_RUN, repack.argv[0]);
|
||||
|
|
Loading…
Reference in a new issue