diff options
Diffstat (limited to 'builtin/for-each-repo.c')
-rw-r--r-- | builtin/for-each-repo.c | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/builtin/for-each-repo.c b/builtin/for-each-repo.c index 52be64a..28186b3 100644 --- a/builtin/for-each-repo.c +++ b/builtin/for-each-repo.c @@ -1,27 +1,30 @@ -#include "cache.h" -#include "config.h" #include "builtin.h" +#include "config.h" +#include "gettext.h" #include "parse-options.h" +#include "path.h" +#include "repository.h" #include "run-command.h" #include "string-list.h" static const char * const for_each_repo_usage[] = { - N_("git for-each-repo --config=<config> <command-args>"), + N_("git for-each-repo --config=<config> [--] <arguments>"), NULL }; -static int run_command_on_repo(const char *path, - void *cbdata) +static int run_command_on_repo(const char *path, int argc, const char ** argv) { int i; struct child_process child = CHILD_PROCESS_INIT; - struct strvec *args = (struct strvec *)cbdata; + char *abspath = interpolate_path(path, 0); child.git_cmd = 1; - strvec_pushl(&child.args, "-C", path, NULL); + strvec_pushl(&child.args, "-C", abspath, NULL); + + for (i = 0; i < argc; i++) + strvec_push(&child.args, argv[i]); - for (i = 0; i < args->nr; i++) - strvec_push(&child.args, args->v[i]); + free(abspath); return run_command(&child); } @@ -31,7 +34,7 @@ int cmd_for_each_repo(int argc, const char **argv, const char *prefix) static const char *config_key = NULL; int i, result = 0; const struct string_list *values; - struct strvec args = STRVEC_INIT; + int err; const struct option options[] = { OPT_STRING(0, "config", &config_key, N_("config"), @@ -45,21 +48,15 @@ int cmd_for_each_repo(int argc, const char **argv, const char *prefix) if (!config_key) die(_("missing --config=<config>")); - for (i = 0; i < argc; i++) - strvec_push(&args, argv[i]); - - 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) + err = repo_config_get_string_multi(the_repository, config_key, &values); + if (err < 0) + usage_msg_optf(_("got bad config --config=%s"), + for_each_repo_usage, options, config_key); + else if (err) return 0; for (i = 0; !result && i < values->nr; i++) - result = run_command_on_repo(values->items[i].string, &args); + result = run_command_on_repo(values->items[i].string, argc, argv); return result; } |