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

[thirdparty/git.git] / builtin / verify-commit.c

diff --git a/builtin/verify-commit.c b/builtin/verify-commit.c
index 3ebad32b0f14fffb5cfafce87411a534bccdf724..5d99b82a64f65efcc673ee8da144748f5e62fc82 100644 (file)
--- a/builtin/verify-commit.c
+++ b/builtin/verify-commit.c
@@ -8,6 +8,8 @@
 #include "cache.h"
 #include "config.h"
 #include "builtin.h"
+#include "gettext.h"
+#include "object-name.h"
 #include "object-store.h"
 #include "repository.h"
 #include "commit.h"
@@ -39,7 +41,7 @@ static int verify_commit(const char *name, unsigned flags)
        struct object_id oid;
        struct object *obj;
 
-       if (get_oid(name, &oid))
+       if (repo_get_oid(the_repository, name, &oid))
                return error("commit '%s' not found.", name);
 
        obj = parse_object(the_repository, &oid);
@@ -52,14 +54,6 @@ static int verify_commit(const char *name, unsigned flags)
        return run_gpg_verify((struct commit *)obj, flags);
 }
 
-static int git_verify_commit_config(const char *var, const char *value, void *cb)
-{
-       int status = git_gpg_config(var, value, cb);
-       if (status)
-               return status;
-       return git_default_config(var, value, cb);
-}
-
 int cmd_verify_commit(int argc, const char **argv, const char *prefix)
 {
        int i = 1, verbose = 0, had_error = 0;
@@ -70,7 +64,7 @@ int cmd_verify_commit(int argc, const char **argv, const char *prefix)
                OPT_END()
        };
 
-       git_config(git_verify_commit_config, NULL);
+       git_config(git_default_config, NULL);
 
        argc = parse_options(argc, argv, prefix, verify_commit_options,
                             verify_commit_usage, PARSE_OPT_KEEP_ARGV0);