for-each-repo: error on bad --config
As noted in 6c62f015520 (for-each-repo: do nothing on empty config, 2021-01-08) this command wants to ignore a non-existing config key, but let's not conflate that with bad config. Before this, all these added tests would pass with an exit code of 0. We could preserve the comment added in 6c62f015520, but now that we're directly using the documented repo_config_get_value_multi() value it's just narrating something that should be obvious from the API use, so let's drop it. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Mar 28, 2023 at 16:04 UTC
f7b2ff95163247a3ec437f0ce78bb27cdac68b75
2 files changed
+12
-5
builtin/for-each-repo.c
+6
-5
@@ -32,6 +32,7 @@ int cmd_for_each_repo(int argc, const char **argv, const char *prefix)
32
static const char *config_key = NULL;
33
int i, result = 0;
34
const struct string_list *values;
35
+ int err;
36
37
const struct option options[] = {
38
OPT_STRING(0, "config", &config_key, N_("config"),
@@ -45,11 +46,11 @@ int cmd_for_each_repo(int argc, const char **argv, const char *prefix)
46
if (!config_key)
47
die(_("missing --config=<config>"));
48
48
- /*
49
- * Do nothing on an empty list, which is equivalent to the case
50
- * where the config variable does not exist at all.
51
- */
52
- if (repo_config_get_value_multi(the_repository, config_key, &values))
49
+ err = repo_config_get_value_multi(the_repository, config_key, &values);
50
+ if (err < 0)
51
+ usage_msg_optf(_("got bad config --config=%s"),
52
+ for_each_repo_usage, options, config_key);
53
+ else if (err)
54
return 0;
55
56
for (i = 0; !result && i < values->nr; i++)
t/t0068-for-each-repo.sh
+6
@@ -39,4 +39,10 @@ test_expect_success 'do nothing on empty config' '
39
git for-each-repo --config=bogus.config -- help --no-such-option
40
'
41
42
+test_expect_success 'error on bad config keys' '
43
+ test_expect_code 129 git for-each-repo --config=a &&
44
+ test_expect_code 129 git for-each-repo --config=a.b. &&
45
+ test_expect_code 129 git for-each-repo --config="'\''.b"
46
+'
47
+
48
test_done