[PATCH] Don't output 'Automatic merge failed, ...'

[git.git] / commit.c

diff --git a/commit.c b/commit.c
index 5619258..2f73cf3 100644 (file)
--- 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;
 
@@ -357,7 +357,7 @@ static int get_one_line(const char *msg, unsigned long len)
 static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const char *line)
 {
        char *date;
-       unsigned int namelen;
+       int namelen;
        unsigned long time;
        int tz, ret;