Merge branch 'jc/gettext-test-fix'

diff --git a/merge-recursive.c b/merge-recursive.c
index 6c40c61c4728d9224006768599d7bf2ded744bb1..6126773a7bfbd21ef38471d69d36b262e50a4050 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1122,7 +1122,7 @@ static int find_first_merges(struct repository *repo,
        struct commit *commit;
        int contains_another;
 
-       char merged_revision[42];
+       char merged_revision[GIT_MAX_HEXSZ + 2];
        const char *rev_args[] = { "rev-list", "--merges", "--ancestry-path",
                                   "--all", merged_revision, NULL };
        struct rev_info revs;