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

[thirdparty/git.git] / builtin / merge-base.c

diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index 6f3941f2a49ce51ee295158a4d78f5c80c1afeb7..854019a32dcc63c9e2504f7aa9e96e7cd7a86762 100644 (file)
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -2,9 +2,12 @@
 #include "cache.h"
 #include "config.h"
 #include "commit.h"
+#include "gettext.h"
+#include "hex.h"
 #include "refs.h"
 #include "diff.h"
 #include "revision.h"
+#include "object-name.h"
 #include "parse-options.h"
 #include "repository.h"
 #include "commit-reach.h"
@@ -13,7 +16,8 @@ static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
 {
        struct commit_list *result, *r;
 
-       result = get_merge_bases_many_dirty(rev[0], rev_nr - 1, rev + 1);
+       result = repo_get_merge_bases_many_dirty(the_repository, rev[0],
+                                                rev_nr - 1, rev + 1);
 
        if (!result)
                return 1;
@@ -42,7 +46,7 @@ static struct commit *get_commit_reference(const char *arg)
        struct object_id revkey;
        struct commit *r;
 
-       if (get_oid(arg, &revkey))
+       if (repo_get_oid(the_repository, arg, &revkey))
                die("Not a valid object name %s", arg);
        r = lookup_commit_reference(the_repository, &revkey);
        if (!r)
@@ -105,7 +109,7 @@ static int handle_is_ancestor(int argc, const char **argv)
                die("--is-ancestor takes exactly two commits");
        one = get_commit_reference(argv[0]);
        two = get_commit_reference(argv[1]);
-       if (in_merge_bases(one, two))
+       if (repo_in_merge_bases(the_repository, one, two))
                return 0;
        else
                return 1;
@@ -118,7 +122,7 @@ static int handle_fork_point(int argc, const char **argv)
        const char *commitname;
 
        commitname = (argc == 2) ? argv[1] : "HEAD";
-       if (get_oid(commitname, &oid))
+       if (repo_get_oid(the_repository, commitname, &oid))
                die("Not a valid object name: '%s'", commitname);
 
        derived = lookup_commit_reference(the_repository, &oid);