diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-26 14:39:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-26 14:39:45 -0700 |
| commit | 1c2ea2cdc0e8c4e5af942c51b234c5af527944f6 (patch) | |
| tree | 26554b52f6dcd97e2194c4b0c32106b6a2b72f92 /builtin/merge.c | |
| parent | b33000878a88b52816b97aeb88ba3677902ad277 (diff) | |
| parent | 2756ca4347cbda05b16954cd7f445c216b935e76 (diff) | |
| download | git-1c2ea2cdc0e8c4e5af942c51b234c5af527944f6.tar.gz git-1c2ea2cdc0e8c4e5af942c51b234c5af527944f6.tar.xz | |
Merge branch 'rs/realloc-array'
Code cleanup.
* rs/realloc-array:
use REALLOC_ARRAY for changing the allocation size of arrays
add macro REALLOC_ARRAY
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index ec6fa9398..dff043dac 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -556,7 +556,7 @@ static void parse_branch_merge_options(char *bmo) if (argc < 0) die(_("Bad branch.%s.mergeoptions string: %s"), branch, split_cmdline_strerror(argc)); - argv = xrealloc(argv, sizeof(*argv) * (argc + 2)); + REALLOC_ARRAY(argv, argc + 2); memmove(argv + 1, argv, sizeof(*argv) * (argc + 1)); argc++; argv[0] = "branch.*.mergeoptions"; |