diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-17 17:08:36 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-17 17:08:36 -0700 |
commit | fc5201ac9f17abf8b70b248b17595f3f3d35c056 (patch) | |
tree | 59d1b7aa95bddfce3c535e8a3c752ef9298ff632 /git.c | |
parent | Merge branch 'master' into next (diff) | |
parent | diff options: add --color (diff) | |
download | tgif-fc5201ac9f17abf8b70b248b17595f3f3d35c056.tar.xz |
Merge branch 'js/diff'
Diffstat (limited to 'git.c')
-rw-r--r-- | git.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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; |