Merge branch 'cc/split-index-config'

diff --git a/builtin/merge.c b/builtin/merge.c
index 95572b18108d6c51391c6527359657cd37329bd6..703827f00668ca0df807f35e300f0927d00075cd 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1255,7 +1255,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
        if (verify_signatures) {
                for (p = remoteheads; p; p = p->next) {
                        struct commit *commit = p->item;
-                       char hex[GIT_SHA1_HEXSZ + 1];
+                       char hex[GIT_MAX_HEXSZ + 1];
                        struct signature_check signature_check;
                        memset(&signature_check, 0, sizeof(signature_check));