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

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

diff --git a/builtin/merge-recursive.c b/builtin/merge-recursive.c
index b9acbf5d3427e7dd88533351db5d2fc245cc25f6..fa1035405c3840a8be0a81836c76850d29108ebe 100644 (file)
--- a/builtin/merge-recursive.c
+++ b/builtin/merge-recursive.c
@@ -1,8 +1,11 @@
 #include "cache.h"
 #include "builtin.h"
+#include "advice.h"
 #include "commit.h"
+#include "gettext.h"
 #include "tag.h"
 #include "merge-recursive.h"
+#include "object-name.h"
 #include "xdiff-interface.h"
 
 static const char builtin_merge_recursive_usage[] =
@@ -49,7 +52,7 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
                }
                if (bases_count < ARRAY_SIZE(bases)-1) {
                        struct object_id *oid = xmalloc(sizeof(struct object_id));
-                       if (get_oid(argv[i], oid))
+                       if (repo_get_oid(the_repository, argv[i], oid))
                                die(_("could not parse object '%s'"), argv[i]);
                        bases[bases_count++] = oid;
                }
@@ -70,9 +73,9 @@ int cmd_merge_recursive(int argc, const char **argv, const char *prefix)
        o.branch1 = argv[++i];
        o.branch2 = argv[++i];
 
-       if (get_oid(o.branch1, &h1))
+       if (repo_get_oid(the_repository, o.branch1, &h1))
                die(_("could not resolve ref '%s'"), o.branch1);
-       if (get_oid(o.branch2, &h2))
+       if (repo_get_oid(the_repository, o.branch2, &h2))
                die(_("could not resolve ref '%s'"), o.branch2);
 
        o.branch1 = better1 = better_branch_name(o.branch1);