[PATCH] git-apply: Don't barf when --stat'ing a diff with no line changes.

[git.git] / commit.c

diff --git a/commit.c b/commit.c
index 9fa03ef..738590f 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -63,6 +63,7 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
 {
        void *bufptr = buffer;
        unsigned char parent[20];
+       struct commit_list **pptr;
 
        if (item->object.parsed)
                return 0;
@@ -72,11 +73,12 @@ int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
        if (item->tree)
                add_ref(&item->object, &item->tree->object);
        bufptr += 46; /* "tree " + "hex sha1" + "\n" */
+       pptr = &item->parents;
        while (!memcmp(bufptr, "parent ", 7) &&
               !get_sha1_hex(bufptr + 7, parent)) {
                struct commit *new_parent = lookup_commit(parent);
                if (new_parent) {
-                       commit_list_insert(new_parent, &item->parents);
+                       pptr = &commit_list_insert(new_parent, pptr)->next;
                        add_ref(&item->object, &new_parent->object);
                }
                bufptr += 48;
@@ -222,10 +224,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 +278,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;