Make "read-tree" take the 'stat' information for a merge result from the

[git.git] / rev-tree.c

diff --git a/rev-tree.c b/rev-tree.c
index c3884e3..ebeceb0 100644 (file)
--- a/rev-tree.c
+++ b/rev-tree.c
@@ -55,6 +55,10 @@ void process_commit(unsigned char *sha1)
 {
        struct commit_list *parents;
        struct commit *obj = lookup_commit(sha1);
+
+       if (obj->object.parsed)
+               return;
+
        parse_commit(obj);
        
        parents = obj->parents;