Skip to content

Commit 897d28b

Browse files
committed
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
2 parents 4fc7b22 + 6c62f01 commit 897d28b

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

builtin/for-each-repo.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@ int cmd_for_each_repo(int argc, const char **argv, const char *prefix)
5151
values = repo_config_get_value_multi(the_repository,
5252
config_key);
5353

54+
/*
55+
* Do nothing on an empty list, which is equivalent to the case
56+
* where the config variable does not exist at all.
57+
*/
58+
if (!values)
59+
return 0;
60+
5461
for (i = 0; !result && i < values->nr; i++)
5562
result = run_command_on_repo(values->items[i].string, &args);
5663

t/t0068-for-each-repo.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,10 @@ test_expect_success 'run based on configured value' '
2727
grep again message
2828
'
2929

30+
test_expect_success 'do nothing on empty config' '
31+
# the whole thing would fail if for-each-ref iterated even
32+
# once, because "git help --no-such-option" would fail
33+
git for-each-repo --config=bogus.config -- help --no-such-option
34+
'
35+
3036
test_done

0 commit comments

Comments
 (0)