pretty_print_commit(): pass commit object instead of commit->buffer.

diff --git a/commit.c b/commit.c
index edd4dedcdd13c2c3fd02714ef282b173f7cec7fe..e8f53e89664446faa1ec6e77f5f02fec64a74bb4 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1,6 +1,6 @@
+#include "cache.h"
 #include "tag.h"
 #include "commit.h"
-#include "cache.h"
 
 int save_commit_buffer = 1;
 
@@ -352,6 +352,21 @@ struct commit *pop_most_recent_commit(struct commit_list **list,
        return ret;
 }
 
+void clear_commit_marks(struct commit *commit, unsigned int mark)
+{
+       struct commit_list *parents;
+
+       parents = commit->parents;
+       commit->object.flags &= ~mark;
+       while (parents) {
+               struct commit *parent = parents->item;
+               if (parent && parent->object.parsed &&
+                   (parent->object.flags & mark))
+                       clear_commit_marks(parent, mark);
+               parents = parents->next;
+       }
+}
+
 /*
  * Generic support for pretty-printing the header
  */
@@ -411,9 +426,10 @@ 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)
+static int add_parent_info(enum cmit_fmt fmt, char *buf, const char *line, int parents, int abbrev)
 {
        int offset = 0;
+       unsigned char sha1[20];
 
        if (fmt == CMIT_FMT_ONELINE)
                return offset;
@@ -422,22 +438,31 @@ static int add_parent_info(enum cmit_fmt fmt, char *buf, const char *line, int p
                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);
+               if (abbrev && !get_sha1_hex(line-41, sha1))
+                       offset = sprintf(buf, "Merge: %s\n",
+                                        find_unique_abbrev(sha1, abbrev));
+               else
+                       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);
+               if (abbrev && !get_sha1_hex(line+7, sha1))
+                       offset += sprintf(buf + offset, "%s\n",
+                                        find_unique_abbrev(sha1, abbrev));
+               else
+                       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)
+unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *commit, unsigned long len, char *buf, unsigned long space, int abbrev)
 {
        int hdr = 1, body = 0;
        unsigned long offset = 0;
        int parents = 0;
        int indent = (fmt == CMIT_FMT_ONELINE) ? 0 : 4;
+       const char *msg = commit->buffer;
 
        for (;;) {
                const char *line = msg;
@@ -473,7 +498,7 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned l
                        if (!memcmp(line, "parent ", 7)) {
                                if (linelen != 48)
                                        die("bad parent line in commit");
-                               offset += add_parent_info(fmt, buf + offset, line, ++parents);
+                               offset += add_parent_info(fmt, buf + offset, line, ++parents, abbrev);
                        }
 
                        /*