[PATCH] Relaxes error checking in epoch.c to allow duplicate parents

diff --git a/commit.c b/commit.c
index 21ac2fe9d71832896c21cae6528a2355068e654a..60047a06d376d4f1144af6a14efc059cec5d2843 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -5,7 +5,7 @@
 
 const char *commit_type = "commit";
 
-static struct commit *check_commit(struct object *obj, unsigned char *sha1)
+static struct commit *check_commit(struct object *obj, const unsigned char *sha1)
 {
        if (obj->type != commit_type) {
                error("Object %s is a %s, not a commit", 
@@ -15,7 +15,7 @@ static struct commit *check_commit(struct object *obj, unsigned char *sha1)
        return (struct commit *) obj;
 }
 
-struct commit *lookup_commit_reference(unsigned char *sha1)
+struct commit *lookup_commit_reference(const unsigned char *sha1)
 {
        struct object *obj = parse_object(sha1);
 
@@ -26,7 +26,7 @@ struct commit *lookup_commit_reference(unsigned char *sha1)
        return check_commit(obj, sha1);
 }
 
-struct commit *lookup_commit(unsigned char *sha1)
+struct commit *lookup_commit(const unsigned char *sha1)
 {
        struct object *obj = lookup_object(sha1);
        if (!obj) {
@@ -222,10 +222,29 @@ static int is_empty_line(const char *line, int len)
        return !len;
 }
 
+static int add_parent_info(enum cmit_fmt fmt, char *buf, const char *line, int parents)
+{
+       int offset = 0;
+       switch (parents) {
+       case 1:
+               break;
+       case 2:
+               /* Go back to the previous line: 40 characters of previous parent, and one '\n' */
+               offset = sprintf(buf, "Merge: %.40s\n", line-41);
+               /* Fallthrough */
+       default:
+               /* Replace the previous '\n' with a space */
+               buf[offset-1] = ' ';
+               offset += sprintf(buf + offset, "%.40s\n", line+7);
+       }
+       return offset;
+}
+
 unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space)
 {
        int hdr = 1, body = 0;
        unsigned long offset = 0;
+       int parents = 0;
 
        for (;;) {
                const char *line = msg;
@@ -257,6 +276,11 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned l
                                offset += linelen;
                                continue;
                        }
+                       if (!memcmp(line, "parent ", 7)) {
+                               if (linelen != 48)
+                                       die("bad parent line in commit");
+                               offset += add_parent_info(fmt, buf + offset, line, ++parents);
+                       }
                        if (!memcmp(line, "author ", 7))
                                offset += add_author_info(fmt, buf + offset, line, linelen);
                        continue;