[PATCH] ssh-push: Don't add '/' to pathname

[git.git] / commit.c

diff --git a/commit.c b/commit.c
index de5e94d..9fa03ef 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1,10 +1,11 @@
+#include <ctype.h>
 #include "tag.h"
 #include "commit.h"
 #include "cache.h"
 
 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", 
@@ -14,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);
 
@@ -25,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) {
@@ -129,7 +130,7 @@ void free_commit_list(struct commit_list *list)
        }
 }
 
-static void insert_by_date(struct commit_list **list, struct commit *item)
+void insert_by_date(struct commit_list **list, struct commit *item)
 {
        struct commit_list **pp = list;
        struct commit_list *p;
@@ -193,12 +194,12 @@ static int get_one_line(const char *msg, unsigned long len)
        return ret;
 }
 
-static int add_author_info(char *buf, const char *line, int len)
+static int add_author_info(enum cmit_fmt fmt, char *buf, const char *line, int len)
 {
        char *date;
        unsigned int namelen;
        unsigned long time;
-       int tz;
+       int tz, ret;
 
        line += strlen("author ");
        date = strchr(line, '>');
@@ -208,14 +209,22 @@ static int add_author_info(char *buf, const char *line, int len)
        time = strtoul(date, &date, 10);
        tz = strtol(date, NULL, 10);
 
-       return sprintf(buf, "Author: %.*s\nDate:   %s\n",
-               namelen, line,
-               show_date(time, tz));
+       ret = sprintf(buf, "Author: %.*s\n", namelen, line);
+       if (fmt == CMIT_FMT_MEDIUM)
+               ret += sprintf(buf + ret, "Date:   %s\n", show_date(time, tz));
+       return ret;
+}
+
+static int is_empty_line(const char *line, int len)
+{
+       while (len && isspace(line[len-1]))
+               len--;
+       return !len;
 }
 
-unsigned long pretty_print_commit(const char *msg, unsigned long len, char *buf, unsigned long space)
+unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space)
 {
-       int hdr = 1;
+       int hdr = 1, body = 0;
        unsigned long offset = 0;
 
        for (;;) {
@@ -237,13 +246,30 @@ unsigned long pretty_print_commit(const char *msg, unsigned long len, char *buf,
 
                msg += linelen;
                len -= linelen;
-               if (linelen == 1)
-                       hdr = 0;
                if (hdr) {
+                       if (linelen == 1) {
+                               hdr = 0;
+                               buf[offset++] = '\n';
+                               continue;
+                       }
+                       if (fmt == CMIT_FMT_RAW) {
+                               memcpy(buf + offset, line, linelen);
+                               offset += linelen;
+                               continue;
+                       }
                        if (!memcmp(line, "author ", 7))
-                               offset += add_author_info(buf + offset, line, linelen);
+                               offset += add_author_info(fmt, buf + offset, line, linelen);
                        continue;
                }
+
+               if (is_empty_line(line, linelen)) {
+                       if (!body)
+                               continue;
+                       if (fmt == CMIT_FMT_SHORT)
+                               break;
+               } else {
+                       body = 1;
+               }
                memset(buf + offset, ' ', 4);
                memcpy(buf + offset + 4, line, linelen);
                offset += linelen + 4;
@@ -254,3 +280,25 @@ unsigned long pretty_print_commit(const char *msg, unsigned long len, char *buf,
        buf[offset] = '\0';
        return offset;
 }
+
+struct commit *pop_commit(struct commit_list **stack)
+{
+       struct commit_list *top = *stack;
+       struct commit *item = top ? top->item : NULL;
+
+       if (top) {
+               *stack = top->next;
+               free(top);
+       }
+       return item;
+}
+
+int count_parents(struct commit * commit)
+{
+        int count = 0;
+        struct commit_list * parents = commit->parents;
+        for (count=0;parents; parents=parents->next,count++)
+          ;
+        return count;
+}
+