Merge branch 'mt/use-passed-repo-more-in-funcs'

[thirdparty/git.git] / builtin / fast-export.c

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index dbec4df92bd7229b1a46f56f27b4e29c706fc214..85868162eec9b0080ab30e7b1b8de1560c5ce5f2 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -293,7 +293,8 @@ static void export_blob(const struct object_id *oid)
                buf = read_object_file(oid, &type, &size);
                if (!buf)
                        die("could not read blob %s", oid_to_hex(oid));
-               if (check_object_signature(oid, buf, size, type_name(type)) < 0)
+               if (check_object_signature(the_repository, oid, buf, size,
+                                          type_name(type)) < 0)
                        die("oid mismatch in blob %s", oid_to_hex(oid));
                object = parse_object_buffer(the_repository, oid, type,
                                             size, buf, &eaten);
@@ -870,8 +871,7 @@ static void handle_tag(const char *name, struct tag *tag)
                printf("reset %s\nfrom %s\n\n",
                       name, oid_to_hex(&null_oid));
        }
-       if (starts_with(name, "refs/tags/"))
-               name += 10;
+       skip_prefix(name, "refs/tags/", &name);
        printf("tag %s\n", name);
        if (mark_tags) {
                mark_next_object(&tag->object);