diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-03-28 13:51:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-28 13:51:05 -0700 |
| commit | c301a23ff8701ae2a50c62c00c400f87e6585511 (patch) | |
| tree | cd1213d0b7473ec050bcb7cd3a2addeaf049b4ba | |
| parent | Merge branch 'jk/subtree-prefix' (diff) | |
| parent | add: use struct argv_array in run_add_interactive() (diff) | |
| download | tgif-c301a23ff8701ae2a50c62c00c400f87e6585511.tar.xz | |
Merge branch 'fr/add-interactive-argv-array'
* fr/add-interactive-argv-array:
add: use struct argv_array in run_add_interactive()
| -rw-r--r-- | builtin/add.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/builtin/add.c b/builtin/add.c index 4b045bace1..459208a326 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -15,6 +15,7 @@ #include "diffcore.h" #include "revision.h" #include "bulk-checkin.h" +#include "argv-array.h" static const char * const builtin_add_usage[] = { N_("git add [options] [--] <pathspec>..."), @@ -141,23 +142,21 @@ static void refresh(int verbose, const struct pathspec *pathspec) int run_add_interactive(const char *revision, const char *patch_mode, const struct pathspec *pathspec) { - int status, ac, i; - const char **args; + int status, i; + struct argv_array argv = ARGV_ARRAY_INIT; - args = xcalloc(sizeof(const char *), (pathspec->nr + 6)); - ac = 0; - args[ac++] = "add--interactive"; + argv_array_push(&argv, "add--interactive"); if (patch_mode) - args[ac++] = patch_mode; + argv_array_push(&argv, patch_mode); if (revision) - args[ac++] = revision; - args[ac++] = "--"; + argv_array_push(&argv, revision); + argv_array_push(&argv, "--"); for (i = 0; i < pathspec->nr; i++) /* pass original pathspec, to be re-parsed */ - args[ac++] = pathspec->items[i].original; + argv_array_push(&argv, pathspec->items[i].original); - status = run_command_v_opt(args, RUN_GIT_CMD); - free(args); + status = run_command_v_opt(argv.argv, RUN_GIT_CMD); + argv_array_clear(&argv); return status; } |