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

[thirdparty/git.git] / builtin / describe.c

diff --git a/builtin/describe.c b/builtin/describe.c
index eea1e330c00c62a649b5a059bbfcf6e351f95269..d360b1d12af935e6cfab9aed5a1049bb70037fba 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -1,6 +1,9 @@
 #define USE_THE_INDEX_VARIABLE
 #include "cache.h"
 #include "config.h"
+#include "environment.h"
+#include "gettext.h"
+#include "hex.h"
 #include "lockfile.h"
 #include "commit.h"
 #include "tag.h"
@@ -8,10 +11,12 @@
 #include "refs.h"
 #include "builtin.h"
 #include "exec-cmd.h"
+#include "object-name.h"
 #include "parse-options.h"
 #include "revision.h"
 #include "diff.h"
 #include "hashmap.h"
+#include "setup.h"
 #include "strvec.h"
 #include "run-command.h"
 #include "object-store.h"
@@ -261,7 +266,7 @@ static unsigned long finish_depth_computation(
                        best->depth++;
                while (parents) {
                        struct commit *p = parents->item;
-                       parse_commit(p);
+                       repo_parse_commit(the_repository, p);
                        if (!(p->object.flags & SEEN))
                                commit_list_insert_by_date(p, list);
                        p->object.flags |= c->object.flags;
@@ -298,7 +303,8 @@ static void append_name(struct commit_name *n, struct strbuf *dst)
 
 static void append_suffix(int depth, const struct object_id *oid, struct strbuf *dst)
 {
-       strbuf_addf(dst, "-%d-g%s", depth, find_unique_abbrev(oid, abbrev));
+       strbuf_addf(dst, "-%d-g%s", depth,
+                   repo_find_unique_abbrev(the_repository, oid, abbrev));
 }
 
 static void describe_commit(struct object_id *oid, struct strbuf *dst)
@@ -403,7 +409,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
                }
                while (parents) {
                        struct commit *p = parents->item;
-                       parse_commit(p);
+                       repo_parse_commit(the_repository, p);
                        if (!(p->object.flags & SEEN))
                                commit_list_insert_by_date(p, &list);
                        p->object.flags |= c->object.flags;
@@ -531,7 +537,7 @@ static void describe(const char *arg, int last_one)
        if (debug)
                fprintf(stderr, _("describe %s\n"), arg);
 
-       if (get_oid(arg, &oid))
+       if (repo_get_oid(the_repository, arg, &oid))
                die(_("Not a valid object name %s"), arg);
        cmit = lookup_commit_reference_gently(the_repository, &oid, 1);