fix git alias
authorJunio C Hamano <junkio@cox.net>
Wed, 14 Jun 2006 13:01:05 +0000 (06:01 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 17 Jun 2006 05:34:09 +0000 (22:34 -0700)
When extra command line arguments are given to a command that
was alias-expanded, the code generated a wrong argument list,
leaving the original alias in the result, and forgetting to
terminate the new argv list.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git.c

diff --git a/git.c b/git.c
index 9469d44..329ebec 100644 (file)
--- a/git.c
+++ b/git.c
@@ -122,9 +122,9 @@ static int handle_alias(int *argcp, const char ***argv)
                        /* insert after command name */
                        if (*argcp > 1) {
                                new_argv = realloc(new_argv, sizeof(char*) *
-                                               (count + *argcp - 1));
-                               memcpy(new_argv + count, *argv, sizeof(char*) *
-                                               (*argcp - 1));
+                                                  (count + *argcp));
+                               memcpy(new_argv + count, *argv + 1,
+                                      sizeof(char*) * *argcp);
                        }
 
                        *argv = new_argv;