diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-11-25 10:07:55 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-25 10:23:10 -0800 |
commit | 324ccbd6a09816af830b22b02bbeb06349141849 (patch) | |
tree | 4a3524f7dc0143c35a5183827d34a517e38214a8 | |
parent | Merge branch 'kh/commit' into wc/add-i (diff) | |
download | tgif-324ccbd6a09816af830b22b02bbeb06349141849.tar.xz |
builtin-add: fix command line building to call interactive
The earlier 7c0ab4458994aa895855abc4a504cf693ecc0cf1 (Teach builtin-add
to pass multiple paths to git-add--interactive) did not allocate enough,
and had unneeded (void*) pointer arithmetic.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | builtin-add.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin-add.c b/builtin-add.c index dd895dfb1d..7c6a296af1 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -138,9 +138,10 @@ static void refresh(int verbose, const char **pathspec) int interactive_add(int argc, const char **argv) { int status; - const char **args = xmalloc(sizeof(const char *) * (argc + 1)); + const char **args = xcalloc(sizeof(const char *), (argc + 2)); + args[0] = "add--interactive"; - memcpy((void *)args + sizeof(const char *), argv, sizeof(const char *) * argc); + memcpy(&(args[1]), argv, sizeof(const char *) * argc); args[argc + 1] = NULL; status = run_command_v_opt(args, RUN_GIT_CMD); |