mirror of
https://github.com/git/git.git
synced 2024-06-01 05:26:17 +02:00
Merge branch 'js/for-each-repo-keep-going' into jch
A scheduled "git maintenance" job is expected to work on all repositories it knows about, but it stopped at the first one that errored out. Now it keeps going. * js/for-each-repo-keep-going: maintenance: running maintenance should not stop on errors for-each-repo: optionally keep going on an error
This commit is contained in:
commit
36af2aec03
|
@ -42,6 +42,15 @@ These config values are loaded from system, global, and local Git config,
|
||||||
as available. If `git for-each-repo` is run in a directory that is not a
|
as available. If `git for-each-repo` is run in a directory that is not a
|
||||||
Git repository, then only the system and global config is used.
|
Git repository, then only the system and global config is used.
|
||||||
|
|
||||||
|
--keep-going::
|
||||||
|
Continue with the remaining repositories if the command failed
|
||||||
|
on a repository. The exit code will still indicate that the
|
||||||
|
overall operation was not successful.
|
||||||
|
+
|
||||||
|
Note that the exact exit code of the failing command is not passed
|
||||||
|
through as the exit code of the `for-each-repo` command: If the command
|
||||||
|
failed in any of the specified repositories, the overall exit code will
|
||||||
|
be 1.
|
||||||
|
|
||||||
SUBPROCESS BEHAVIOR
|
SUBPROCESS BEHAVIOR
|
||||||
-------------------
|
-------------------
|
||||||
|
|
|
@ -32,6 +32,7 @@ static int run_command_on_repo(const char *path, int argc, const char ** argv)
|
||||||
int cmd_for_each_repo(int argc, const char **argv, const char *prefix)
|
int cmd_for_each_repo(int argc, const char **argv, const char *prefix)
|
||||||
{
|
{
|
||||||
static const char *config_key = NULL;
|
static const char *config_key = NULL;
|
||||||
|
int keep_going = 0;
|
||||||
int i, result = 0;
|
int i, result = 0;
|
||||||
const struct string_list *values;
|
const struct string_list *values;
|
||||||
int err;
|
int err;
|
||||||
|
@ -39,6 +40,8 @@ int cmd_for_each_repo(int argc, const char **argv, const char *prefix)
|
||||||
const struct option options[] = {
|
const struct option options[] = {
|
||||||
OPT_STRING(0, "config", &config_key, N_("config"),
|
OPT_STRING(0, "config", &config_key, N_("config"),
|
||||||
N_("config key storing a list of repository paths")),
|
N_("config key storing a list of repository paths")),
|
||||||
|
OPT_BOOL(0, "keep-going", &keep_going,
|
||||||
|
N_("keep going even if command fails in a repository")),
|
||||||
OPT_END()
|
OPT_END()
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -55,8 +58,14 @@ int cmd_for_each_repo(int argc, const char **argv, const char *prefix)
|
||||||
else if (err)
|
else if (err)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
for (i = 0; !result && i < values->nr; i++)
|
for (i = 0; i < values->nr; i++) {
|
||||||
result = run_command_on_repo(values->items[i].string, argc, argv);
|
int ret = run_command_on_repo(values->items[i].string, argc, argv);
|
||||||
|
if (ret) {
|
||||||
|
if (!keep_going)
|
||||||
|
return ret;
|
||||||
|
result = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1870,6 +1870,7 @@ static int launchctl_schedule_plist(const char *exec_path, enum schedule_priorit
|
||||||
"<string>%s/git</string>\n"
|
"<string>%s/git</string>\n"
|
||||||
"<string>--exec-path=%s</string>\n"
|
"<string>--exec-path=%s</string>\n"
|
||||||
"<string>for-each-repo</string>\n"
|
"<string>for-each-repo</string>\n"
|
||||||
|
"<string>--keep-going</string>\n"
|
||||||
"<string>--config=maintenance.repo</string>\n"
|
"<string>--config=maintenance.repo</string>\n"
|
||||||
"<string>maintenance</string>\n"
|
"<string>maintenance</string>\n"
|
||||||
"<string>run</string>\n"
|
"<string>run</string>\n"
|
||||||
|
@ -2112,7 +2113,7 @@ static int schtasks_schedule_task(const char *exec_path, enum schedule_priority
|
||||||
"<Actions Context=\"Author\">\n"
|
"<Actions Context=\"Author\">\n"
|
||||||
"<Exec>\n"
|
"<Exec>\n"
|
||||||
"<Command>\"%s\\headless-git.exe\"</Command>\n"
|
"<Command>\"%s\\headless-git.exe\"</Command>\n"
|
||||||
"<Arguments>--exec-path=\"%s\" for-each-repo --config=maintenance.repo maintenance run --schedule=%s</Arguments>\n"
|
"<Arguments>--exec-path=\"%s\" for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=%s</Arguments>\n"
|
||||||
"</Exec>\n"
|
"</Exec>\n"
|
||||||
"</Actions>\n"
|
"</Actions>\n"
|
||||||
"</Task>\n";
|
"</Task>\n";
|
||||||
|
@ -2257,7 +2258,7 @@ static int crontab_update_schedule(int run_maintenance, int fd)
|
||||||
"# replaced in the future by a Git command.\n\n");
|
"# replaced in the future by a Git command.\n\n");
|
||||||
|
|
||||||
strbuf_addf(&line_format,
|
strbuf_addf(&line_format,
|
||||||
"%%d %%s * * %%s \"%s/git\" --exec-path=\"%s\" for-each-repo --config=maintenance.repo maintenance run --schedule=%%s\n",
|
"%%d %%s * * %%s \"%s/git\" --exec-path=\"%s\" for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=%%s\n",
|
||||||
exec_path, exec_path);
|
exec_path, exec_path);
|
||||||
fprintf(cron_in, line_format.buf, minute, "1-23", "*", "hourly");
|
fprintf(cron_in, line_format.buf, minute, "1-23", "*", "hourly");
|
||||||
fprintf(cron_in, line_format.buf, minute, "0", "1-6", "daily");
|
fprintf(cron_in, line_format.buf, minute, "0", "1-6", "daily");
|
||||||
|
@ -2458,7 +2459,7 @@ static int systemd_timer_write_service_template(const char *exec_path)
|
||||||
"\n"
|
"\n"
|
||||||
"[Service]\n"
|
"[Service]\n"
|
||||||
"Type=oneshot\n"
|
"Type=oneshot\n"
|
||||||
"ExecStart=\"%s/git\" --exec-path=\"%s\" for-each-repo --config=maintenance.repo maintenance run --schedule=%%i\n"
|
"ExecStart=\"%s/git\" --exec-path=\"%s\" for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=%%i\n"
|
||||||
"LockPersonality=yes\n"
|
"LockPersonality=yes\n"
|
||||||
"MemoryDenyWriteExecute=yes\n"
|
"MemoryDenyWriteExecute=yes\n"
|
||||||
"NoNewPrivileges=yes\n"
|
"NoNewPrivileges=yes\n"
|
||||||
|
|
|
@ -59,4 +59,20 @@ test_expect_success 'error on NULL value for config keys' '
|
||||||
test_cmp expect actual
|
test_cmp expect actual
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success '--keep-going' '
|
||||||
|
git config keep.going non-existing &&
|
||||||
|
git config --add keep.going . &&
|
||||||
|
|
||||||
|
test_must_fail git for-each-repo --config=keep.going \
|
||||||
|
-- branch >out 2>err &&
|
||||||
|
test_grep "cannot change to .*non-existing" err &&
|
||||||
|
test_must_be_empty out &&
|
||||||
|
|
||||||
|
test_must_fail git for-each-repo --config=keep.going --keep-going \
|
||||||
|
-- branch >out 2>err &&
|
||||||
|
test_grep "cannot change to .*non-existing" err &&
|
||||||
|
git branch >expect &&
|
||||||
|
test_cmp expect out
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
|
@ -639,9 +639,9 @@ test_expect_success 'start from empty cron table' '
|
||||||
# start registers the repo
|
# start registers the repo
|
||||||
git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
|
git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
|
||||||
|
|
||||||
grep "for-each-repo --config=maintenance.repo maintenance run --schedule=daily" cron.txt &&
|
grep "for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=daily" cron.txt &&
|
||||||
grep "for-each-repo --config=maintenance.repo maintenance run --schedule=hourly" cron.txt &&
|
grep "for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=hourly" cron.txt &&
|
||||||
grep "for-each-repo --config=maintenance.repo maintenance run --schedule=weekly" cron.txt
|
grep "for-each-repo --keep-going --config=maintenance.repo maintenance run --schedule=weekly" cron.txt
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success 'stop from existing schedule' '
|
test_expect_success 'stop from existing schedule' '
|
||||||
|
|
Loading…
Reference in New Issue