Merge refs/heads/master from .

1 files changed, 1 insertions, 1 deletions

diff --git a/commit.c b/commit.c
index 56192587af..e51eda1524 100644
--- a/commit.c
+++ b/commit.c
@@ -102,7 +102,7 @@ static unsigned long parse_commit_date(const char *buf)
 static struct commit_graft {
 	unsigned char sha1[20];
 	int nr_parent;
-	unsigned char parent[][20]; /* more */
+	unsigned char parent[0][20]; /* more */
 } **commit_graft;
 static int commit_graft_alloc, commit_graft_nr;