diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:23 -0800 |
| commit | 897d28bcc23878b5d98b46f3903e3d2a302d8a01 (patch) | |
| tree | affe738017077b0b717da198a0c788f9fb60bcef | |
| parent | Merge branch 'jc/sign-off' into maint (diff) | |
| parent | for-each-repo: do nothing on empty config (diff) | |
| download | tgif-897d28bcc23878b5d98b46f3903e3d2a302d8a01.tar.xz | |
Merge branch 'ds/for-each-repo-noopfix' into maint
"git for-each-repo --config=<var> <cmd>" should not run <cmd> for
any repository when the configuration variable <var> is not defined
even once.
* ds/for-each-repo-noopfix:
for-each-repo: do nothing on empty config
| -rw-r--r-- | builtin/for-each-repo.c | 7 | ||||
| -rwxr-xr-x | t/t0068-for-each-repo.sh | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/builtin/for-each-repo.c b/builtin/for-each-repo.c index 5bba623ff1..52be64a437 100644 --- a/builtin/for-each-repo.c +++ b/builtin/for-each-repo.c @@ -51,6 +51,13 @@ int cmd_for_each_repo(int argc, const char **argv, const char *prefix) values = repo_config_get_value_multi(the_repository, config_key); + /* + * Do nothing on an empty list, which is equivalent to the case + * where the config variable does not exist at all. + */ + if (!values) + return 0; + for (i = 0; !result && i < values->nr; i++) result = run_command_on_repo(values->items[i].string, &args); diff --git a/t/t0068-for-each-repo.sh b/t/t0068-for-each-repo.sh index 136b4ec839..4675e85251 100755 --- a/t/t0068-for-each-repo.sh +++ b/t/t0068-for-each-repo.sh @@ -27,4 +27,10 @@ test_expect_success 'run based on configured value' ' grep again message ' +test_expect_success 'do nothing on empty config' ' + # the whole thing would fail if for-each-ref iterated even + # once, because "git help --no-such-option" would fail + git for-each-repo --config=bogus.config -- help --no-such-option +' + test_done |