Extract a struct stat_data from cache_entry

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index dd561e5031955b54c995abde1271c4841c3c7d24..d1d68e9fc62889f647aff0005cc2ca2d3fef9d94 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -613,6 +613,7 @@ static void import_marks(char *input_file)
                char *line_end, *mark_end;
                unsigned char sha1[20];
                struct object *object;
+               struct commit *commit;
                enum object_type type;
 
                line_end = strchr(line, '\n');
@@ -622,7 +623,7 @@ static void import_marks(char *input_file)
 
                mark = strtoumax(line + 1, &mark_end, 10);
                if (!mark || mark_end == line + 1
-                       || *mark_end != ' ' || get_sha1(mark_end + 1, sha1))
+                       || *mark_end != ' ' || get_sha1_hex(mark_end + 1, sha1))
                        die("corrupt mark line: %s", line);
 
                if (last_idnum < mark)
@@ -636,7 +637,11 @@ static void import_marks(char *input_file)
                        /* only commits */
                        continue;
 
-               object = parse_object(sha1);
+               commit = lookup_commit(sha1);
+               if (!commit)
+                       die("not a commit? can't happen: %s", sha1_to_hex(sha1));
+
+               object = &commit->object;
 
                if (object->flags & SHOWN)
                        error("Object %s already has a mark", sha1_to_hex(sha1));