Merge branch 'pr/use-default-sigpipe-setting'

diff --git a/builtin/merge.c b/builtin/merge.c
index ec6fa9398faf2e5c61ebce198a5006cfb6dc8192..dff043dac33ea88a8c5a05ea5ac3da71ca00c0d3 100644 (file)
--- 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";