db58d5a351
Remove the_repository global variable in favor of the repository argument that gets passed in "builtin/verify-commit.c". When `-h` is passed to the command outside a Git repository, the `run_builtin()` will call the `cmd_verify_commit()` function with `repo` set to NULL and then early in the function, `parse_options()` call will give the options help and exit. Pass the repository available in the calling context to `verify_commit()` to remove it's dependency on the global `the_repository` variable. Mentored-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Usman Akinyemi <usmanakinyemi202@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
84 lines
2.1 KiB
C
84 lines
2.1 KiB
C
/*
|
|
* Builtin "git commit-commit"
|
|
*
|
|
* Copyright (c) 2014 Michael J Gruber <git@drmicha.warpmail.net>
|
|
*
|
|
* Based on git-verify-tag
|
|
*/
|
|
#include "builtin.h"
|
|
#include "config.h"
|
|
#include "gettext.h"
|
|
#include "object-name.h"
|
|
#include "commit.h"
|
|
#include "parse-options.h"
|
|
#include "gpg-interface.h"
|
|
|
|
static const char * const verify_commit_usage[] = {
|
|
N_("git verify-commit [-v | --verbose] [--raw] <commit>..."),
|
|
NULL
|
|
};
|
|
|
|
static int run_gpg_verify(struct commit *commit, unsigned flags)
|
|
{
|
|
struct signature_check signature_check;
|
|
int ret;
|
|
|
|
memset(&signature_check, 0, sizeof(signature_check));
|
|
|
|
ret = check_commit_signature(commit, &signature_check);
|
|
print_signature_buffer(&signature_check, flags);
|
|
|
|
signature_check_clear(&signature_check);
|
|
return ret;
|
|
}
|
|
|
|
static int verify_commit(struct repository *repo, const char *name, unsigned flags)
|
|
{
|
|
struct object_id oid;
|
|
struct object *obj;
|
|
|
|
if (repo_get_oid(repo, name, &oid))
|
|
return error("commit '%s' not found.", name);
|
|
|
|
obj = parse_object(repo, &oid);
|
|
if (!obj)
|
|
return error("%s: unable to read file.", name);
|
|
if (obj->type != OBJ_COMMIT)
|
|
return error("%s: cannot verify a non-commit object of type %s.",
|
|
name, type_name(obj->type));
|
|
|
|
return run_gpg_verify((struct commit *)obj, flags);
|
|
}
|
|
|
|
int cmd_verify_commit(int argc,
|
|
const char **argv,
|
|
const char *prefix,
|
|
struct repository *repo)
|
|
{
|
|
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()
|
|
};
|
|
|
|
repo_config(repo, git_default_config, NULL);
|
|
|
|
argc = parse_options(argc, argv, prefix, verify_commit_options,
|
|
verify_commit_usage, PARSE_OPT_KEEP_ARGV0);
|
|
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(repo, argv[i++], flags))
|
|
had_error = 1;
|
|
return had_error;
|
|
}
|