object-name.h: move declarations for object-name.c functions from cache.h

[thirdparty/git.git] / diff-lib.c

diff --git a/diff-lib.c b/diff-lib.c
index 70b3578b907b0cd69a18c24b6bf03f8cb8dcd8d2..d292405a262495974eb7de0e8b6e590df024d1c8 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -6,12 +6,15 @@
 #include "commit.h"
 #include "diff.h"
 #include "diffcore.h"
+#include "gettext.h"
 #include "hex.h"
+#include "object-name.h"
 #include "revision.h"
 #include "cache-tree.h"
 #include "unpack-trees.h"
 #include "refs.h"
 #include "submodule.h"
+#include "trace.h"
 #include "dir.h"
 #include "fsmonitor.h"
 #include "commit-reach.h"
@@ -582,7 +585,7 @@ void diff_get_merge_base(const struct rev_info *revs, struct object_id *mb)
        if (revs->pending.nr == 1) {
                struct object_id oid;
 
-               if (get_oid("HEAD", &oid))
+               if (repo_get_oid(the_repository, "HEAD", &oid))
                        die(_("unable to get HEAD"));
 
                mb_child[1] = lookup_commit_reference(the_repository, &oid);