Make merge-cache not fail immediatelly when the merge program

[git.git] / object.c

diff --git a/object.c b/object.c
index 91bbc6e..b5a62e7 100644 (file)
--- a/object.c
+++ b/object.c
@@ -1,5 +1,9 @@
 #include "object.h"
+#include "blob.h"
+#include "tree.h"
+#include "commit.h"
 #include "cache.h"
+#include "tag.h"
 #include <stdlib.h>
 #include <string.h>
 
@@ -94,3 +98,42 @@ void mark_reachable(struct object *obj, unsigned int mask)
                p = p->next;
        }
 }
+
+struct object *parse_object(unsigned char *sha1)
+{
+       unsigned long mapsize;
+       void *map = map_sha1_file(sha1, &mapsize);
+       if (map) {
+               struct object *obj;
+               char type[100];
+               unsigned long size;
+               void *buffer = unpack_sha1_file(map, mapsize, type, &size);
+               munmap(map, mapsize);
+               if (!buffer)
+                       return NULL;
+               if (check_sha1_signature(sha1, buffer, size, type) < 0)
+                       printf("sha1 mismatch %s\n", sha1_to_hex(sha1));
+               if (!strcmp(type, "blob")) {
+                       struct blob *blob = lookup_blob(sha1);
+                       parse_blob_buffer(blob, buffer, size);
+                       obj = &blob->object;
+               } else if (!strcmp(type, "tree")) {
+                       struct tree *tree = lookup_tree(sha1);
+                       parse_tree_buffer(tree, buffer, size);
+                       obj = &tree->object;
+               } else if (!strcmp(type, "commit")) {
+                       struct commit *commit = lookup_commit(sha1);
+                       parse_commit_buffer(commit, buffer, size);
+                       obj = &commit->object;
+               } else if (!strcmp(type, "tag")) {
+                       struct tag *tag = lookup_tag(sha1);
+                       parse_tag_buffer(tag, buffer, size);
+                       obj = &tag->object;
+               } else {
+                       obj = NULL;
+               }
+               free(buffer);
+               return obj;
+       }
+       return NULL;
+}