mirror of
https://github.com/git/git.git
synced 2024-06-01 18:16:08 +02:00
8c9e292dc0
Fix various issues of SYNOPSIS and -h output syntax where: * Options such as --force were missing entirely * ...or the short option, such as -f * We said "opts" or "options", but could instead enumerate the (small) set of supported options * Options that were missing entirely (ls-remote's --sort=<key>) As we can specify "--sort" multiple times (it's backed by a string-list" it should really be "[(--sort=<key>)...]", which is what "git for-each-ref" lists it as, but let's leave that issue for a subsequent cleanup, and stop at making these consistent. Other "ref-filter.h" users share the same issue, e.g. "git-branch.txt". * For "verify-tag" and "verify-commit" we were missing the "--raw" option. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
91 lines
2.3 KiB
C
91 lines
2.3 KiB
C
/*
|
|
* Builtin "git commit-commit"
|
|
*
|
|
* Copyright (c) 2014 Michael J Gruber <git@drmicha.warpmail.net>
|
|
*
|
|
* 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 "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(const char *name, unsigned flags)
|
|
{
|
|
struct object_id oid;
|
|
struct object *obj;
|
|
|
|
if (get_oid(name, &oid))
|
|
return error("commit '%s' not found.", name);
|
|
|
|
obj = parse_object(the_repository, &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);
|
|
}
|
|
|
|
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;
|
|
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()
|
|
};
|
|
|
|
git_config(git_verify_commit_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(argv[i++], flags))
|
|
had_error = 1;
|
|
return had_error;
|
|
}
|