 9c9b4f2f8b
			
		
	
	9c9b4f2f8b
	
	
	
		
			
			This patch puts the usage info strings that were not already in docopt- like format into docopt-like format, which will be a litle easier for end users and a lot easier for translators. Changes include: - Placing angle brackets around fill-in-the-blank parameters - Putting dashes in multiword parameter names - Adding spaces to [-f|--foobar] to make [-f | --foobar] - Replacing <foobar>* with [<foobar>...] Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			83 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			83 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include "builtin.h"
 | |
| #include "cache.h"
 | |
| #include "run-command.h"
 | |
| #include "parse-options.h"
 | |
| 
 | |
| #define VERIFY_PACK_VERBOSE 01
 | |
| #define VERIFY_PACK_STAT_ONLY 02
 | |
| 
 | |
| static int verify_one_pack(const char *path, unsigned int flags)
 | |
| {
 | |
| 	struct child_process index_pack = CHILD_PROCESS_INIT;
 | |
| 	const char *argv[] = {"index-pack", NULL, NULL, NULL };
 | |
| 	struct strbuf arg = STRBUF_INIT;
 | |
| 	int verbose = flags & VERIFY_PACK_VERBOSE;
 | |
| 	int stat_only = flags & VERIFY_PACK_STAT_ONLY;
 | |
| 	int err;
 | |
| 
 | |
| 	if (stat_only)
 | |
| 		argv[1] = "--verify-stat-only";
 | |
| 	else if (verbose)
 | |
| 		argv[1] = "--verify-stat";
 | |
| 	else
 | |
| 		argv[1] = "--verify";
 | |
| 
 | |
| 	/*
 | |
| 	 * In addition to "foo.pack" we accept "foo.idx" and "foo";
 | |
| 	 * normalize these forms to "foo.pack" for "index-pack --verify".
 | |
| 	 */
 | |
| 	strbuf_addstr(&arg, path);
 | |
| 	if (strbuf_strip_suffix(&arg, ".idx") ||
 | |
| 	    !ends_with(arg.buf, ".pack"))
 | |
| 		strbuf_addstr(&arg, ".pack");
 | |
| 	argv[2] = arg.buf;
 | |
| 
 | |
| 	index_pack.argv = argv;
 | |
| 	index_pack.git_cmd = 1;
 | |
| 
 | |
| 	err = run_command(&index_pack);
 | |
| 
 | |
| 	if (verbose || stat_only) {
 | |
| 		if (err)
 | |
| 			printf("%s: bad\n", arg.buf);
 | |
| 		else {
 | |
| 			if (!stat_only)
 | |
| 				printf("%s: ok\n", arg.buf);
 | |
| 		}
 | |
| 	}
 | |
| 	strbuf_release(&arg);
 | |
| 
 | |
| 	return err;
 | |
| }
 | |
| 
 | |
| static const char * const verify_pack_usage[] = {
 | |
| 	N_("git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."),
 | |
| 	NULL
 | |
| };
 | |
| 
 | |
| int cmd_verify_pack(int argc, const char **argv, const char *prefix)
 | |
| {
 | |
| 	int err = 0;
 | |
| 	unsigned int flags = 0;
 | |
| 	int i;
 | |
| 	const struct option verify_pack_options[] = {
 | |
| 		OPT_BIT('v', "verbose", &flags, N_("verbose"),
 | |
| 			VERIFY_PACK_VERBOSE),
 | |
| 		OPT_BIT('s', "stat-only", &flags, N_("show statistics only"),
 | |
| 			VERIFY_PACK_STAT_ONLY),
 | |
| 		OPT_END()
 | |
| 	};
 | |
| 
 | |
| 	git_config(git_default_config, NULL);
 | |
| 	argc = parse_options(argc, argv, prefix, verify_pack_options,
 | |
| 			     verify_pack_usage, 0);
 | |
| 	if (argc < 1)
 | |
| 		usage_with_options(verify_pack_usage, verify_pack_options);
 | |
| 	for (i = 0; i < argc; i++) {
 | |
| 		if (verify_one_pack(argv[i], flags))
 | |
| 			err = 1;
 | |
| 	}
 | |
| 
 | |
| 	return err;
 | |
| }
 |