diff options
| author | René Scharfe <l.s.r@web.de> | 2014-09-16 18:56:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-18 16:13:42 (GMT) |
| commit | 2756ca4347cbda05b16954cd7f445c216b935e76 (patch) | |
| tree | 70afb2d44557fd05bbc0707c190c6026ab6135fd /builtin/merge.c | |
| parent | 3ac22f82edec108986b2627fcd6f2a8039617a23 (diff) | |
| download | git-2756ca4347cbda05b16954cd7f445c216b935e76.zip git-2756ca4347cbda05b16954cd7f445c216b935e76.tar.gz git-2756ca4347cbda05b16954cd7f445c216b935e76.tar.bz2 | |
use REALLOC_ARRAY for changing the allocation size of arrays
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 9da9e30..cb9af1e 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"; |