mirror of
https://github.com/git/git
synced 2024-10-30 14:03:28 +00: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>
77 lines
1.9 KiB
C
77 lines
1.9 KiB
C
/*
|
|
* Builtin "git verify-tag"
|
|
*
|
|
* Copyright (c) 2007 Carlos Rica <jasampler@gmail.com>
|
|
*
|
|
* Based on git-verify-tag.sh
|
|
*/
|
|
#include "cache.h"
|
|
#include "config.h"
|
|
#include "builtin.h"
|
|
#include "tag.h"
|
|
#include "run-command.h"
|
|
#include "parse-options.h"
|
|
#include "gpg-interface.h"
|
|
#include "ref-filter.h"
|
|
|
|
static const char * const verify_tag_usage[] = {
|
|
N_("git verify-tag [-v | --verbose] [--format=<format>] [--raw] <tag>..."),
|
|
NULL
|
|
};
|
|
|
|
static int git_verify_tag_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_tag(int argc, const char **argv, const char *prefix)
|
|
{
|
|
int i = 1, verbose = 0, had_error = 0;
|
|
unsigned flags = 0;
|
|
struct ref_format format = REF_FORMAT_INIT;
|
|
const struct option verify_tag_options[] = {
|
|
OPT__VERBOSE(&verbose, N_("print tag contents")),
|
|
OPT_BIT(0, "raw", &flags, N_("print raw gpg status output"), GPG_VERIFY_RAW),
|
|
OPT_STRING(0, "format", &format.format, N_("format"), N_("format to use for the output")),
|
|
OPT_END()
|
|
};
|
|
|
|
git_config(git_verify_tag_config, NULL);
|
|
|
|
argc = parse_options(argc, argv, prefix, verify_tag_options,
|
|
verify_tag_usage, PARSE_OPT_KEEP_ARGV0);
|
|
if (argc <= i)
|
|
usage_with_options(verify_tag_usage, verify_tag_options);
|
|
|
|
if (verbose)
|
|
flags |= GPG_VERIFY_VERBOSE;
|
|
|
|
if (format.format) {
|
|
if (verify_ref_format(&format))
|
|
usage_with_options(verify_tag_usage,
|
|
verify_tag_options);
|
|
flags |= GPG_VERIFY_OMIT_STATUS;
|
|
}
|
|
|
|
while (i < argc) {
|
|
struct object_id oid;
|
|
const char *name = argv[i++];
|
|
|
|
if (get_oid(name, &oid)) {
|
|
had_error = !!error("tag '%s' not found.", name);
|
|
continue;
|
|
}
|
|
|
|
if (gpg_verify_tag(&oid, name, flags)) {
|
|
had_error = 1;
|
|
continue;
|
|
}
|
|
|
|
if (format.format)
|
|
pretty_print_ref(name, &oid, &format);
|
|
}
|
|
return had_error;
|
|
}
|