Git 2.23

diff --git a/builtin/verify-commit.c b/builtin/verify-commit.c
index ec0c4e3d836f9242a8e34dd7fffa5ddfb835907b..40c69a0bedde5be02af557fd0c92efc1d2c857e5 100644 (file)
--- a/builtin/verify-commit.c
+++ b/builtin/verify-commit.c
@@ -6,10 +6,12 @@
  * Based on git-verify-tag
  */
 #include "cache.h"
+#include "config.h"
 #include "builtin.h"
+#include "object-store.h"
+#include "repository.h"
 #include "commit.h"
 #include "run-command.h"
-#include <signal.h>
 #include "parse-options.h"
 #include "gpg-interface.h"
 
@@ -18,46 +20,36 @@ static const char * const verify_commit_usage[] = {
                NULL
 };
 
-static int run_gpg_verify(const unsigned char *sha1, const char *buf, unsigned long size, int verbose)
+static int run_gpg_verify(struct commit *commit, unsigned flags)
 {
        struct signature_check signature_check;
+       int ret;
 
        memset(&signature_check, 0, sizeof(signature_check));
 
-       check_commit_signature(lookup_commit(sha1), &signature_check);
-
-       if (verbose && signature_check.payload)
-               fputs(signature_check.payload, stdout);
-
-       if (signature_check.gpg_output)
-               fputs(signature_check.gpg_output, stderr);
+       ret = check_commit_signature(commit, &signature_check);
+       print_signature_buffer(&signature_check, flags);
 
        signature_check_clear(&signature_check);
-       return signature_check.result != 'G';
+       return ret;
 }
 
-static int verify_commit(const char *name, int verbose)
+static int verify_commit(const char *name, unsigned flags)
 {
-       enum object_type type;
-       unsigned char sha1[20];
-       char *buf;
-       unsigned long size;
-       int ret;
+       struct object_id oid;
+       struct object *obj;
 
-       if (get_sha1(name, sha1))
+       if (get_oid(name, &oid))
                return error("commit '%s' not found.", name);
 
-       buf = read_sha1_file(sha1, &type, &size);
-       if (!buf)
+       obj = parse_object(the_repository, &oid);
+       if (!obj)
                return error("%s: unable to read file.", name);
-       if (type != OBJ_COMMIT)
+       if (obj->type != OBJ_COMMIT)
                return error("%s: cannot verify a non-commit object of type %s.",
-                               name, typename(type));
-
-       ret = run_gpg_verify(sha1, buf, size, verbose);
+                               name, type_name(obj->type));
 
-       free(buf);
-       return ret;
+       return run_gpg_verify((struct commit *)obj, flags);
 }
 
 static int git_verify_commit_config(const char *var, const char *value, void *cb)
@@ -71,8 +63,10 @@ static int git_verify_commit_config(const char *var, const char *value, void *cb
 int cmd_verify_commit(int argc, const char **argv, const char *prefix)
 {
        int i = 1, verbose = 0, had_error = 0;
+       unsigned flags = 0;
        const struct option verify_commit_options[] = {
                OPT__VERBOSE(&verbose, N_("print commit contents")),
+               OPT_BIT(0, "raw", &flags, N_("print raw gpg status output"), GPG_VERIFY_RAW),
                OPT_END()
        };
 
@@ -83,11 +77,14 @@ int cmd_verify_commit(int argc, const char **argv, const char *prefix)
        if (argc <= i)
                usage_with_options(verify_commit_usage, verify_commit_options);
 
+       if (verbose)
+               flags |= GPG_VERIFY_VERBOSE;
+
        /* sometimes the program was terminated because this signal
         * was received in the process of writing the gpg input: */
        signal(SIGPIPE, SIG_IGN);
        while (i < argc)
-               if (verify_commit(argv[i++], verbose))
+               if (verify_commit(argv[i++], flags))
                        had_error = 1;
        return had_error;
 }