diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-07-14 15:35:50 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:56:08 -0700 |
| commit | 480ca6449ed0981311b8aef2fbaa89d024b881ee (patch) | |
| tree | d9741f5300117f5c66b9b591f2bd44e4a08617c8 /builtin/add.c | |
| parent | 5ab2a2dabd6e13cd6830ff4f12f232dc79278e29 (diff) | |
| download | git-480ca6449ed0981311b8aef2fbaa89d024b881ee.tar.gz git-480ca6449ed0981311b8aef2fbaa89d024b881ee.tar.xz | |
convert run_add_interactive to use struct pathspec
This passes the pathspec, more or less unmodified, to
git-add--interactive. The command itself does not process pathspec. It
simply passes the pathspec to other builtin commands. So if all those
commands support pathspec, we're good.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/add.c')
| -rw-r--r-- | builtin/add.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/builtin/add.c b/builtin/add.c index 9a7235e92..d039fc9ae 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -244,16 +244,12 @@ static void refresh(int verbose, const char **pathspec) } int run_add_interactive(const char *revision, const char *patch_mode, - const char **pathspec) + const struct pathspec *pathspec) { - int status, ac, pc = 0; + int status, ac, i; const char **args; - if (pathspec) - while (pathspec[pc]) - pc++; - - args = xcalloc(sizeof(const char *), (pc + 5)); + args = xcalloc(sizeof(const char *), (pathspec->nr + 6)); ac = 0; args[ac++] = "add--interactive"; if (patch_mode) @@ -261,11 +257,9 @@ int run_add_interactive(const char *revision, const char *patch_mode, if (revision) args[ac++] = revision; args[ac++] = "--"; - if (pc) { - memcpy(&(args[ac]), pathspec, sizeof(const char *) * pc); - ac += pc; - } - args[ac] = NULL; + for (i = 0; i < pathspec->nr; i++) + /* pass original pathspec, to be re-parsed */ + args[ac++] = pathspec->items[i].original; status = run_command_v_opt(args, RUN_GIT_CMD); free(args); @@ -280,17 +274,17 @@ int interactive_add(int argc, const char **argv, const char *prefix, int patch) * git-add--interactive itself does not parse pathspec. It * simply passes the pathspec to other builtin commands. Let's * hope all of them support all magic, or we'll need to limit - * the magic here. There is still a problem with prefix. But - * that'll be worked on later on. + * the magic here. */ parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC & ~PATHSPEC_FROMTOP, PATHSPEC_PREFER_FULL | - PATHSPEC_SYMLINK_LEADING_PATH, + PATHSPEC_SYMLINK_LEADING_PATH | + PATHSPEC_PREFIX_ORIGIN, prefix, argv); return run_add_interactive(NULL, patch ? "--patch" : NULL, - pathspec.raw); + &pathspec); } static int edit_patch(int argc, const char **argv, const char *prefix) |