[PATCH] Make ls-* output consistent with diff-* output format.

diff --git a/commit.c b/commit.c
index b45118a544276797f6bc9c0f482c187647f0e88d..abbf155da938cf675696e812b4083c8a773ffab0 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1,10 +1,30 @@
+#include "tag.h"
 #include "commit.h"
 #include "cache.h"
-#include <string.h>
-#include <limits.h>
 
 const char *commit_type = "commit";
 
+static struct commit *check_commit(struct object *obj, unsigned char *sha1)
+{
+       if (obj->type != commit_type) {
+               error("Object %s is a %s, not a commit", 
+                     sha1_to_hex(sha1), obj->type);
+               return NULL;
+       }
+       return (struct commit *) obj;
+}
+
+struct commit *lookup_commit_reference(unsigned char *sha1)
+{
+       struct object *obj = parse_object(sha1);
+
+       if (!obj)
+               return NULL;
+       if (obj->type == tag_type)
+               obj = ((struct tag *)obj)->tagged;
+       return check_commit(obj, sha1);
+}
+
 struct commit *lookup_commit(unsigned char *sha1)
 {
        struct object *obj = lookup_object(sha1);
@@ -15,12 +35,9 @@ struct commit *lookup_commit(unsigned char *sha1)
                ret->object.type = commit_type;
                return ret;
        }
-       if (obj->type != commit_type) {
-               error("Object %s is a %s, not a commit", 
-                     sha1_to_hex(sha1), obj->type);
-               return NULL;
-       }
-       return (struct commit *) obj;
+       if (!obj->type)
+               obj->type = commit_type;
+       return check_commit(obj, sha1);
 }
 
 static unsigned long parse_commit_date(const char *buf)
@@ -41,24 +58,14 @@ static unsigned long parse_commit_date(const char *buf)
        return date;
 }
 
-int parse_commit(struct commit *item)
+int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
 {
-       char type[20];
-       void * buffer, *bufptr;
-       unsigned long size;
+       void *bufptr = buffer;
        unsigned char parent[20];
+
        if (item->object.parsed)
                return 0;
        item->object.parsed = 1;
-       buffer = bufptr = read_sha1_file(item->object.sha1, type, &size);
-       if (!buffer)
-               return error("Could not read %s",
-                            sha1_to_hex(item->object.sha1));
-       if (strcmp(type, commit_type)) {
-               free(buffer);
-               return error("Object %s not a commit",
-                            sha1_to_hex(item->object.sha1));
-       }
        get_sha1_hex(bufptr + 5, parent);
        item->tree = lookup_tree(parent);
        if (item->tree)
@@ -74,10 +81,36 @@ int parse_commit(struct commit *item)
                bufptr += 48;
        }
        item->date = parse_commit_date(bufptr);
-       free(buffer);
        return 0;
 }
 
+int parse_commit(struct commit *item)
+{
+       char type[20];
+       void *buffer;
+       unsigned long size;
+       int ret;
+
+       if (item->object.parsed)
+               return 0;
+       buffer = read_sha1_file(item->object.sha1, type, &size);
+       if (!buffer)
+               return error("Could not read %s",
+                            sha1_to_hex(item->object.sha1));
+       if (strcmp(type, commit_type)) {
+               free(buffer);
+               return error("Object %s not a commit",
+                            sha1_to_hex(item->object.sha1));
+       }
+       ret = parse_commit_buffer(item, buffer, size);
+       if (!ret) {
+               item->buffer = buffer;
+               return 0;
+       }
+       free(buffer);
+       return ret;
+}
+
 void commit_list_insert(struct commit *item, struct commit_list **list_p)
 {
        struct commit_list *new_list = xmalloc(sizeof(struct commit_list));