There's no reason verify-tag.c needs to include signal.h. It's already in git-compat-util.h, which we properly include as the first header. And there doesn't seem to be a particular reason for this include; it's just an artifact from the file creation in2ae68fcb78(Make verify-tag a builtin., 2007-07-27). Likewise verify-commit.c has the same issue, probably because it was created using verify-tag as a template ind07b00b7f3(verify-commit: scriptable commit signature verification, 2014-06-23). These includes are probably just redundant, and not hurting anything by circumventing the order that git-compat-util.h tries to impose, since we'll always have loaded git-compat-util by the time we get to these. So this is just a cleanup, and shouldn't fix or break any platforms. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			78 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			78 lines
		
	
	
		
			1.8 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>] <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;
 | 
						|
}
 |