Fix git(1) link to git-index-pack

[git.git] / commit.c

diff --git a/commit.c b/commit.c
index 8f40318..ebf4db6 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -34,6 +34,8 @@ enum cmit_fmt get_commit_format(const char *arg)
                return CMIT_FMT_SHORT;
        if (!strcmp(arg, "=full"))
                return CMIT_FMT_FULL;
+       if (!strcmp(arg, "=fuller"))
+               return CMIT_FMT_FULLER;
        if (!strcmp(arg, "=oneline"))
                return CMIT_FMT_ONELINE;
        die("invalid --pretty format");
@@ -55,7 +57,7 @@ static struct commit *check_commit(struct object *obj,
 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
                                              int quiet)
 {
-       struct object *obj = deref_tag(parse_object(sha1));
+       struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
 
        if (!obj)
                return NULL;
@@ -361,6 +363,7 @@ static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const c
        int namelen;
        unsigned long time;
        int tz, ret;
+       const char *filler = "    ";
 
        if (fmt == CMIT_FMT_ONELINE)
                return 0;
@@ -371,9 +374,20 @@ static int add_user_info(const char *what, enum cmit_fmt fmt, char *buf, const c
        time = strtoul(date, &date, 10);
        tz = strtol(date, NULL, 10);
 
-       ret = sprintf(buf, "%s: %.*s\n", what, namelen, line);
-       if (fmt == CMIT_FMT_MEDIUM)
+       ret = sprintf(buf, "%s: %.*s%.*s\n", what,
+                     (fmt == CMIT_FMT_FULLER) ? 4 : 0,
+                     filler, namelen, line);
+       switch (fmt) {
+       case CMIT_FMT_MEDIUM:
                ret += sprintf(buf + ret, "Date:   %s\n", show_date(time, tz));
+               break;
+       case CMIT_FMT_FULLER:
+               ret += sprintf(buf + ret, "%sDate: %s\n", what, show_date(time, tz));
+               break;
+       default:
+               /* notin' */
+               break;
+       }
        return ret;
 }
 
@@ -448,12 +462,21 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned l
                                        die("bad parent line in commit");
                                offset += add_parent_info(fmt, buf + offset, line, ++parents);
                        }
+
+                       /*
+                        * MEDIUM == DEFAULT shows only author with dates.
+                        * FULL shows both authors but not dates.
+                        * FULLER shows both authors and dates.
+                        */
                        if (!memcmp(line, "author ", 7))
-                               offset += add_user_info("Author", fmt, buf + offset, line + 7);
-                       if (fmt == CMIT_FMT_FULL) {
-                               if (!memcmp(line, "committer ", 10))
-                                       offset += add_user_info("Commit", fmt, buf + offset, line + 10);
-                       }
+                               offset += add_user_info("Author", fmt,
+                                                       buf + offset,
+                                                       line + 7);
+                       if (!memcmp(line, "committer ", 10) &&
+                           (fmt == CMIT_FMT_FULL || fmt == CMIT_FMT_FULLER))
+                               offset += add_user_info("Commit", fmt,
+                                                       buf + offset,
+                                                       line + 10);
                        continue;
                }
 
@@ -513,7 +536,7 @@ int count_parents(struct commit * commit)
 void sort_in_topological_order(struct commit_list ** list)
 {
        struct commit_list * next = *list;
-       struct commit_list * work = NULL;
+       struct commit_list * work = NULL, **insert;
        struct commit_list ** pptr = list;
        struct sort_node * nodes;
        struct sort_node * next_nodes;
@@ -557,11 +580,12 @@ void sort_in_topological_order(struct commit_list ** list)
          * the tips serve as a starting set for the work queue.
          */
        next=*list;
+       insert = &work;
        while (next) {
                struct sort_node * node = (struct sort_node *)next->item->object.util;
 
                if (node->indegree == 0) {
-                       commit_list_insert(next->item, &work);
+                       insert = &commit_list_insert(next->item, insert)->next;
                }
                next=next->next;
        }