undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/alias-use-copy-array'

Browse Source 
Code cleanup.

* rs/alias-use-copy-array:
  git: use COPY_ARRAY and MOVE_ARRAY in handle_alias()
This commit is contained in:
Junio C Hamano 2019-10-07 11:33:01 +09:00
commit cabb145fe3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git.c
View File

@ -369,8 +369,7 @@ static int handle_alias(int *argcp, const char ***argv)
die(_("alias '%s' changes environment variables.\n" die(_("alias '%s' changes environment variables.\n"
"You can use '!git' in the alias to do this"), "You can use '!git' in the alias to do this"),
alias_command); alias_command);
memmove(new_argv - option_count, new_argv, MOVE_ARRAY(new_argv - option_count, new_argv, count);
count * sizeof(char *));
new_argv -= option_count; new_argv -= option_count;
if (count < 1) if (count < 1)
@ -385,7 +384,7 @@ static int handle_alias(int *argcp, const char ***argv)
REALLOC_ARRAY(new_argv, count + *argcp); REALLOC_ARRAY(new_argv, count + *argcp);
/* insert after command name */ /* insert after command name */
memcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp); COPY_ARRAY(new_argv + count, *argv + 1, *argcp);
trace2_cmd_alias(alias_command, new_argv); trace2_cmd_alias(alias_command, new_argv);
trace2_cmd_list_config(); trace2_cmd_list_config();