kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

fetch: use argv_array instead of hand-building arrays 

Fetch invokes itself recursively when recursing into
submodules or handling "fetch --multiple". In both cases, it
builds the child's command line by pushing options onto a
statically-sized array. In both cases, the array is
currently just big enough to handle the largest possible
case. However, this technique is brittle and error-prone, so
let's replace it with a dynamic argv_array.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2012-09-01 07:27:35 -04:00 committed by Junio C Hamano
parent ba4d1c7b16
commit 85556d4e37
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
builtin/fetch.c
View File

@ -14,6 +14,7 @@
#include "transport.h" #include "transport.h"
#include "submodule.h" #include "submodule.h"
#include "connected.h" #include "connected.h"
#include "argv-array.h"


static const char * const builtin_fetch_usage[] = { static const char * const builtin_fetch_usage[] = {
"git fetch [<options>] [<repository> [<refspec>...]]", "git fetch [<options>] [<repository> [<refspec>...]]",
@ -841,38 +842,35 @@ static int add_remote_or_group(const char *name, struct string_list *list)
return 1; return 1;
} }


static void add_options_to_argv(int *argc, const char **argv) static void add_options_to_argv(struct argv_array *argv)
{ {
if (dry_run) if (dry_run)
argv[(*argc)++] = "--dry-run"; argv_array_push(argv, "--dry-run");
if (prune) if (prune)
argv[(*argc)++] = "--prune"; argv_array_push(argv, "--prune");
if (update_head_ok) if (update_head_ok)
argv[(*argc)++] = "--update-head-ok"; argv_array_push(argv, "--update-head-ok");
if (force) if (force)
argv[(*argc)++] = "--force"; argv_array_push(argv, "--force");
if (keep) if (keep)
argv[(*argc)++] = "--keep"; argv_array_push(argv, "--keep");
if (recurse_submodules == RECURSE_SUBMODULES_ON) if (recurse_submodules == RECURSE_SUBMODULES_ON)
argv[(*argc)++] = "--recurse-submodules"; argv_array_push(argv, "--recurse-submodules");
else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
argv[(*argc)++] = "--recurse-submodules=on-demand"; argv_array_push(argv, "--recurse-submodules=on-demand");
if (verbosity >= 2) if (verbosity >= 2)
argv[(*argc)++] = "-v"; argv_array_push(argv, "-v");
if (verbosity >= 1) if (verbosity >= 1)
argv[(*argc)++] = "-v"; argv_array_push(argv, "-v");
else if (verbosity < 0) else if (verbosity < 0)
argv[(*argc)++] = "-q"; argv_array_push(argv, "-q");


} }


static int fetch_multiple(struct string_list *list) static int fetch_multiple(struct string_list *list)
{ {
int i, result = 0; int i, result = 0;
const char *argv[12] = { "fetch", "--append" }; struct argv_array argv = ARGV_ARRAY_INIT;
int argc = 2;

add_options_to_argv(&argc, argv);


if (!append && !dry_run) { if (!append && !dry_run) {
int errcode = truncate_fetch_head(); int errcode = truncate_fetch_head();
@ -880,18 +878,22 @@ static int fetch_multiple(struct string_list *list)
return errcode; return errcode;
} }


argv_array_pushl(&argv, "fetch", "--append", NULL);
add_options_to_argv(&argv);

for (i = 0; i < list->nr; i++) { for (i = 0; i < list->nr; i++) {
const char *name = list->items[i].string; const char *name = list->items[i].string;
argv[argc] = name; argv_array_push(&argv, name);
argv[argc + 1] = NULL;
if (verbosity >= 0) if (verbosity >= 0)
printf(_("Fetching %s\n"), name); printf(_("Fetching %s\n"), name);
if (run_command_v_opt(argv, RUN_GIT_CMD)) { if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
error(_("Could not fetch %s"), name); error(_("Could not fetch %s"), name);
result = 1; result = 1;
} }
argv_array_pop(&argv);
} }


argv_array_clear(&argv);
return result; return result;
} }


@ -1007,13 +1009,14 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
} }


if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) { if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
const char *options[10]; struct argv_array options = ARGV_ARRAY_INIT;
int num_options = 0;
add_options_to_argv(&num_options, options); add_options_to_argv(&options);
result = fetch_populated_submodules(num_options, options, result = fetch_populated_submodules(options.argc, options.argv,
submodule_prefix, submodule_prefix,
recurse_submodules, recurse_submodules,
verbosity < 0); verbosity < 0);
argv_array_clear(&options);
} }


/* All names were strdup()ed or strndup()ed */ /* All names were strdup()ed or strndup()ed */