fast-import: convert internal structs to struct object_id

diff --git a/merge-recursive.c b/merge-recursive.c
index 62decd51cc74a9197abbda28dc8efd6f83287a6b..9d6fd577e27ee5ec51b9f71c9f321b50a4af1803 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -304,7 +304,7 @@ struct tree *write_tree_from_memory(struct merge_options *o)
                return NULL;
        }
 
-       result = lookup_tree(active_cache_tree->sha1);
+       result = lookup_tree(active_cache_tree->oid.hash);
 
        return result;
 }