treewide: be explicit about dependence on convert.h

[thirdparty/git.git] / blame.c

diff --git a/blame.c b/blame.c
index 8bfeaa1c63aedc151b1125e98f52229842d48b19..ff2a6c49125f4b7a49243c26a47c2b63e84d3df0 100644 (file)
--- a/blame.c
+++ b/blame.c
@@ -3,9 +3,14 @@
 #include "object-store.h"
 #include "cache-tree.h"
 #include "mergesort.h"
+#include "convert.h"
 #include "diff.h"
 #include "diffcore.h"
+#include "gettext.h"
+#include "hex.h"
+#include "setup.h"
 #include "tag.h"
+#include "trace2.h"
 #include "blame.h"
 #include "alloc.h"
 #include "commit-slab.h"
@@ -1028,8 +1033,9 @@ static void fill_origin_blob(struct diff_options *opt,
                                    &o->blob_oid, 1, &file->ptr, &file_size))
                        ;
                else
-                       file->ptr = read_object_file(&o->blob_oid, &type,
-                                                    &file_size);
+                       file->ptr = repo_read_object_file(the_repository,
+                                                         &o->blob_oid, &type,
+                                                         &file_size);
                file->size = file_size;
 
                if (!file->ptr)
@@ -2429,7 +2435,7 @@ static void pass_blame(struct blame_scoreboard *sb, struct blame_origin *origin,
 
                        if (sg_origin[i])
                                continue;
-                       if (parse_commit(p))
+                       if (repo_parse_commit(the_repository, p))
                                continue;
                        porigin = find(sb->repo, p, origin, sb->bloom_data);
                        if (!porigin)
@@ -2592,7 +2598,7 @@ void assign_blame(struct blame_scoreboard *sb, int opt)
                 * so hold onto it in the meantime.
                 */
                blame_origin_incref(suspect);
-               parse_commit(commit);
+               repo_parse_commit(the_repository, commit);
                if (sb->reverse ||
                    (!(commit->object.flags & UNINTERESTING) &&
                     !(revs->max_age != -1 && commit->date < revs->max_age)))
@@ -2838,8 +2844,10 @@ void setup_scoreboard(struct blame_scoreboard *sb,
                                    &sb->final_buf_size))
                        ;
                else
-                       sb->final_buf = read_object_file(&o->blob_oid, &type,
-                                                        &sb->final_buf_size);
+                       sb->final_buf = repo_read_object_file(the_repository,
+                                                             &o->blob_oid,
+                                                             &type,
+                                                             &sb->final_buf_size);
 
                if (!sb->final_buf)
                        die(_("cannot read blob %s for path %s"),