rugged 1.7.2 → 1.9.0

data/vendor/libgit2/src/cli/common.c

@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#include <git2.h>
+#include <git2/sys/config.h>
+
+#include "git2_util.h"
+#include "vector.h"
+#include "fs_path.h"
+
+#include "common.h"
+#include "error.h"
+
+static int parse_option(cli_opt *opt, void *data)
+{
+	git_str kv = GIT_STR_INIT, env = GIT_STR_INIT;
+	git_vector *cmdline_config = data;
+	int error = 0;
+
+	if (opt->spec && opt->spec->alias == 'c') {
+		if (git_str_puts(&kv, opt->value) < 0) {
+			error = cli_error_git();
+			goto done;
+		}
+	}
+
+	else if (opt->spec && !strcmp(opt->spec->name, "config-env")) {
+		char *val = strchr(opt->value, '=');
+
+		if (val == NULL || *(val + 1) == '\0') {
+			error = cli_error("invalid config format: '%s'", opt->value);
+			goto done;
+		}
+
+		if (git_str_put(&kv, opt->value, (val - opt->value)) < 0) {
+			error = cli_error_git();
+			goto done;
+		}
+
+		val++;
+
+		if ((error = git__getenv(&env, val)) == GIT_ENOTFOUND) {
+			error = cli_error("missing environment variable '%s' for configuration '%s'", val, kv.ptr);
+			goto done;
+		} else if (error) {
+			error = cli_error_git();
+			goto done;
+		}
+
+		if (git_str_putc(&kv, '=') < 0 ||
+		    git_str_puts(&kv, env.ptr) < 0) {
+			error = cli_error_git();
+			goto done;
+		}
+	}
+
+	if (kv.size > 0 &&
+	    git_vector_insert(cmdline_config, git_str_detach(&kv)) < 0)
+		error = cli_error_git();
+
+done:
+	git_str_dispose(&env);
+	git_str_dispose(&kv);
+	return error;
+}
+
+static int parse_common_options(
+	git_repository *repo,
+	cli_repository_open_options *opts)
+{
+	cli_opt_spec common_opts[] = {
+		{ CLI_COMMON_OPT_CONFIG },
+		{ CLI_COMMON_OPT_CONFIG_ENV },
+		{ 0 }
+	};
+	git_config_backend_memory_options config_opts =
+		GIT_CONFIG_BACKEND_MEMORY_OPTIONS_INIT;
+	git_vector cmdline = GIT_VECTOR_INIT;
+	git_config *config = NULL;
+	git_config_backend *backend = NULL;
+	int error = 0;
+
+	config_opts.backend_type = "command line";
+
+	if ((error = cli_opt_foreach(common_opts, opts->args,
+			opts->args_len, CLI_OPT_PARSE_GNU, parse_option,
+			&cmdline)) < 0)
+		goto done;
+
+	if (git_vector_length(&cmdline) == 0)
+		goto done;
+
+	if (git_repository_config(&config, repo) < 0 ||
+	    git_config_backend_from_values(&backend,
+			(const char **)cmdline.contents, cmdline.length,
+			&config_opts) < 0 ||
+	    git_config_add_backend(config, backend, GIT_CONFIG_LEVEL_APP,
+			repo, 0) < 0)
+		error = cli_error_git();
+
+done:
+	if (error && backend)
+		backend->free(backend);
+	git_config_free(config);
+	git_vector_dispose_deep(&cmdline);
+	return error;
+}
+
+int cli_repository_open(
+	git_repository **out,
+	cli_repository_open_options *opts)
+{
+	git_repository *repo;
+
+	if (git_repository_open_ext(&repo, ".", GIT_REPOSITORY_OPEN_FROM_ENV, NULL) < 0)
+		return -1;
+
+	if (opts && parse_common_options(repo, opts) < 0)
+		return -1;
+
+	*out = repo;
+	return 0;
+}
+
+/*
+ * This resolves paths - not _pathspecs_ like git - it accepts an absolute
+ * path (to a path within the repository working directory) or a path
+ * relative to the current directory.
+ */
+int cli_resolve_path(git_str *out, git_repository *repo, const char *given_path)
+{
+	git_str path = GIT_STR_INIT;
+	int error = 0;
+
+	if (!git_fs_path_is_absolute(given_path)) {
+		char cwd[GIT_PATH_MAX];
+
+		if (p_getcwd(cwd, GIT_PATH_MAX) < 0)
+			error = cli_error_os();
+		else if (git_str_puts(&path, cwd) < 0 ||
+		         git_fs_path_apply_relative(&path, given_path) < 0)
+			error = cli_error_git();
+
+		if (error)
+			goto done;
+	} else if (git_str_puts(&path, given_path) < 0) {
+		error = cli_error_git();
+		goto done;
+	}
+
+	error = git_fs_path_make_relative(&path, git_repository_workdir(repo));
+
+	if (error == GIT_ENOTFOUND)
+		error = cli_error("path '%s' is not inside the git repository '%s'",
+			given_path, git_repository_workdir(repo));
+	else if (error < 0)
+		error = cli_error_git();
+	else
+		git_str_swap(out, &path);
+
+done:
+	git_str_dispose(&path);
+	return error;
+}

data/vendor/libgit2/src/cli/common.h

@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) the libgit2 contributors. All rights reserved.
+ *
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
+ * a Linking Exception. For full terms see the included COPYING file.
+ */
+
+#ifndef CLI_common_h__
+#define CLI_common_h__
+
+#define PROGRAM_NAME "git2"
+
+#include "git2_util.h"
+
+#include "error.h"
+#include "opt.h"
+#include "opt_usage.h"
+
+/*
+ * Common command arguments.
+ */
+
+extern int cli_opt__show_help;
+extern int cli_opt__use_pager;
+
+#define CLI_COMMON_OPT_HELP \
+	CLI_OPT_TYPE_SWITCH, "help",       0, &cli_opt__show_help,  1, \
+	CLI_OPT_USAGE_HIDDEN | CLI_OPT_USAGE_STOP_PARSING, \
+	NULL, "display help information"
+#define CLI_COMMON_OPT_CONFIG \
+	CLI_OPT_TYPE_VALUE,   NULL,       'c', NULL,                0, \
+	CLI_OPT_USAGE_HIDDEN, \
+	"key=value", "add configuration value"
+#define CLI_COMMON_OPT_CONFIG_ENV \
+	CLI_OPT_TYPE_VALUE,  "config-env", 0,  NULL,                0, \
+	CLI_OPT_USAGE_HIDDEN, \
+	"key=value", "set configuration value to environment variable"
+#define CLI_COMMON_OPT_NO_PAGER \
+	CLI_OPT_TYPE_SWITCH, "no-pager",   0,  &cli_opt__use_pager, 0, \
+	CLI_OPT_USAGE_HIDDEN, \
+	NULL, "don't paginate multi-page output"
+
+#define CLI_COMMON_OPT \
+	{ CLI_COMMON_OPT_HELP }, \
+	{ CLI_COMMON_OPT_CONFIG }, \
+	{ CLI_COMMON_OPT_CONFIG_ENV }, \
+	{ CLI_COMMON_OPT_NO_PAGER }
+
+typedef struct {
+	char **args;
+	int args_len;
+} cli_repository_open_options;
+
+extern int cli_repository_open(
+	git_repository **out,
+	cli_repository_open_options *opts);
+
+extern int cli_resolve_path(
+	git_str *out,
+	git_repository *repo,
+	const char *given_path);
+
+#endif /* CLI_common_h__ */

data/vendor/libgit2/src/cli/error.h

@@ -8,7 +8,7 @@
 #ifndef CLI_error_h__
 #define CLI_error_h__
 
-#include "cli.h"
+#include "common.h"
 #include <stdio.h>
 
 #define CLI_EXIT_OK      0

data/vendor/libgit2/src/cli/main.c

@@ -7,17 +7,19 @@
 
 #include <stdio.h>
 #include <git2.h>
-#include "cli.h"
+#include "common.h"
 #include "cmd.h"
 
-static int show_help = 0;
+int cli_opt__show_help = 0;
+int cli_opt__use_pager = 1;
+
 static int show_version = 0;
 static char *command = NULL;
 static char **args = NULL;
 
 const cli_opt_spec cli_common_opts[] = {
-	{ CLI_OPT_TYPE_SWITCH,    "help",      0, &show_help,    1,
-	  CLI_OPT_USAGE_DEFAULT,   NULL,      "display help information" },
+	CLI_COMMON_OPT,
+
 	{ CLI_OPT_TYPE_SWITCH,    "version",   0, &show_version, 1,
 	  CLI_OPT_USAGE_DEFAULT,   NULL,      "display the version" },
 	{ CLI_OPT_TYPE_ARG,       "command",   0, &command,      0,
@@ -28,21 +30,57 @@ const cli_opt_spec cli_common_opts[] = {
 };
 
 const cli_cmd_spec cli_cmds[] = {
+	{ "blame",       cmd_blame,       "Show the origin of each line of a file" },
 	{ "cat-file",    cmd_cat_file,    "Display an object in the repository" },
 	{ "clone",       cmd_clone,       "Clone a repository into a new directory" },
+	{ "config",      cmd_config,      "View or set configuration values " },
 	{ "hash-object", cmd_hash_object, "Hash a raw object and product its object ID" },
 	{ "help",        cmd_help,        "Display help information" },
+	{ "index-pack",  cmd_index_pack,  "Create an index for a packfile" },
+	{ "init",        cmd_init,        "Create a new git repository" },
 	{ NULL }
 };
 
+/*
+ * Reorder the argv as it was given, since git has the notion of global
+ * options (like `--help` or `-c key=val`) that we want to pass to the
+ * subcommand, and that can appear early in the arguments, before the
+ * command name. Put the command-name in argv[1] to allow easier parsing.
+ */
+static void reorder_args(char **argv, size_t first)
+{
+	char *tmp;
+	size_t i;
+
+	if (first == 1)
+		return;
+
+	tmp = argv[first];
+
+	for (i = first; i > 1; i--)
+		argv[i] = argv[i - 1];
+
+	argv[1] = tmp;
+}
+
+/*
+ * When invoked without a command, or just with `--help`, we invoke
+ * the help command; but we want to preserve only arguments that would
+ * be useful for that.
+ */
+static void help_args(int *argc, char **argv)
+{
+	cli_opt__show_help = 0;
+
+	argv[0] = "help";
+	*argc = 1;
+}
+
 int main(int argc, char **argv)
 {
 	const cli_cmd_spec *cmd;
 	cli_opt_parser optparser;
 	cli_opt opt;
-	char *help_args[3] = { NULL };
-	int help_args_len;
-	int args_len = 0;
 	int ret = 0;
 
 	if (git_libgit2_init() < 0) {
@@ -56,7 +94,7 @@ int main(int argc, char **argv)
 	while (cli_opt_parser_next(&opt, &optparser)) {
 		if (!opt.spec) {
 			cli_opt_status_fprint(stderr, PROGRAM_NAME, &opt);
-			cli_opt_usage_fprint(stderr, PROGRAM_NAME, NULL, cli_common_opts);
+			cli_opt_usage_fprint(stderr, PROGRAM_NAME, NULL, cli_common_opts, CLI_OPT_USAGE_SHOW_HIDDEN);
 			ret = CLI_EXIT_USAGE;
 			goto done;
 		}
@@ -66,8 +104,7 @@ int main(int argc, char **argv)
 		 * remaining arguments as args for the command itself.
 		 */
 		if (command) {
-			args = &argv[optparser.idx];
-			args_len = (int)(argc - optparser.idx);
+			reorder_args(argv, optparser.idx);
 			break;
 		}
 	}
@@ -77,19 +114,10 @@ int main(int argc, char **argv)
 		goto done;
 	}
 
-	/*
-	 * If `--help <command>` is specified, delegate to that command's
-	 * `--help` option.  If no command is specified, run the `help`
-	 * command.  Do this by updating the args to emulate that behavior.
-	 */
-	if (!command || show_help) {
-		help_args[0] = command ? (char *)command : "help";
-		help_args[1] = command ? "--help" : NULL;
-		help_args_len = command ? 2 : 1;
-
-		command = help_args[0];
-		args = help_args;
-		args_len = help_args_len;
+	if (!command) {
+		help_args(&argc, argv);
+		ret = cmd_help(argc, argv);
+		goto done;
 	}
 
 	if ((cmd = cli_cmd_spec_byname(command)) == NULL) {
@@ -98,7 +126,7 @@ int main(int argc, char **argv)
 		goto done;
 	}
 
-	ret = cmd->fn(args_len, args);
+	ret = cmd->fn(argc - 1, &argv[1]);
 
 done:
 	git_libgit2_shutdown();

data/vendor/libgit2/src/cli/opt.c

@@ -10,7 +10,7 @@
  * This file was produced by using the `rename.pl` script included with
  * adopt.  The command-line specified was:
  *
- * ./rename.pl cli_opt --filename=opt --include=cli.h --inline=GIT_INLINE --header-guard=CLI_opt_h__ --lowercase-status --without-usage
+ * ./rename.pl cli_opt --filename=opt --include=common.h --inline=GIT_INLINE --header-guard=CLI_opt_h__ --lowercase-status --without-usage
  */
 
 #include <stdlib.h>
@@ -19,7 +19,11 @@
 #include <limits.h>
 #include <assert.h>
 
-#include "cli.h"
+#if defined(__sun) || defined(__illumos__)
+# include <alloca.h>
+#endif
+
+#include "common.h"
 #include "opt.h"
 
 #ifdef _WIN32
@@ -73,7 +77,7 @@ GIT_INLINE(const cli_opt_spec *) spec_for_long(
 
 		/* Handle --option=value arguments */
 		if (spec->type == CLI_OPT_TYPE_VALUE &&
-		    eql &&
+		    spec->name && eql &&
 		    strncmp(arg, spec->name, eql_pos) == 0 &&
 		    spec->name[eql_pos] == '\0') {
 			*has_value = 1;
@@ -575,6 +579,28 @@ cli_opt_status_t cli_opt_parse(
 	return validate_required(opt, specs, given_specs);
 }
 
+int cli_opt_foreach(
+	const cli_opt_spec specs[],
+	char **args,
+	size_t args_len,
+	unsigned int flags,
+	int (*callback)(cli_opt *, void *),
+	void *callback_data)
+{
+	cli_opt_parser parser;
+	cli_opt opt;
+	int ret;
+
+	cli_opt_parser_init(&parser, specs, args, args_len, flags);
+
+	while (cli_opt_parser_next(&opt, &parser)) {
+		if ((ret = callback(&opt, callback_data)) != 0)
+			return ret;
+	}
+
+	return 0;
+}
+
 static int spec_name_fprint(FILE *file, const cli_opt_spec *spec)
 {
 	int error;

data/vendor/libgit2/src/cli/opt.h

@@ -10,7 +10,7 @@
  * This file was produced by using the `rename.pl` script included with
  * adopt.  The command-line specified was:
  *
- * ./rename.pl cli_opt --filename=opt --include=cli.h --inline=GIT_INLINE --header-guard=CLI_opt_h__ --lowercase-status --without-usage
+ * ./rename.pl cli_opt --filename=opt --include=common.h --inline=GIT_INLINE --header-guard=CLI_opt_h__ --lowercase-status --without-usage
  */
 
 #ifndef CLI_opt_h__
@@ -275,8 +275,8 @@ typedef struct cli_opt_parser {
 	size_t arg_idx;
 	size_t in_args;
 	size_t in_short;
-	int needs_sort : 1,
-	    in_literal : 1;
+	unsigned int needs_sort : 1,
+	             in_literal : 1;
 } cli_opt_parser;
 
 /**
@@ -300,6 +300,24 @@ cli_opt_status_t cli_opt_parse(
     size_t args_len,
     unsigned int flags);
 
+/**
+ * Quickly executes the given callback for each argument.
+ *
+ * @param specs A NULL-terminated array of `cli_opt_spec`s that can be parsed
+ * @param args The arguments that will be parsed
+ * @param args_len The length of arguments to be parsed
+ * @param flags The `cli_opt_flag_t flags for parsing
+ * @param callback The callback to invoke for each specified option
+ * @param callback_data Data to be provided to the callback
+ */
+int cli_opt_foreach(
+	const cli_opt_spec specs[],
+	char **args,
+	size_t args_len,
+	unsigned int flags,
+	int (*callback)(cli_opt *, void *),
+	void *callback_data);
+
 /**
  * Initializes a parser that parses the given arguments according to the
  * given specifications.

data/vendor/libgit2/src/cli/opt_usage.c

@@ -5,35 +5,84 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "cli.h"
+#include "common.h"
 #include "str.h"
 
-static int print_spec_name(git_str *out, const cli_opt_spec *spec)
+#define is_switch_or_value(spec) \
+	((spec)->type == CLI_OPT_TYPE_SWITCH || \
+	 (spec)->type == CLI_OPT_TYPE_VALUE)
+
+static int print_spec_args(git_str *out, const cli_opt_spec *spec)
 {
-	if (spec->type == CLI_OPT_TYPE_VALUE && spec->alias &&
-	    !(spec->usage & CLI_OPT_USAGE_VALUE_OPTIONAL) &&
-	    !(spec->usage & CLI_OPT_USAGE_SHOW_LONG))
-		return git_str_printf(out, "-%c <%s>", spec->alias, spec->value_name);
-	if (spec->type == CLI_OPT_TYPE_VALUE && spec->alias &&
-	    !(spec->usage & CLI_OPT_USAGE_SHOW_LONG))
-		return git_str_printf(out, "-%c [<%s>]", spec->alias, spec->value_name);
-	if (spec->type == CLI_OPT_TYPE_VALUE &&
-	    !(spec->usage & CLI_OPT_USAGE_VALUE_OPTIONAL))
-		return git_str_printf(out, "--%s[=<%s>]", spec->name, spec->value_name);
-	if (spec->type == CLI_OPT_TYPE_VALUE)
-		return git_str_printf(out, "--%s=<%s>", spec->name, spec->value_name);
+	GIT_ASSERT(!is_switch_or_value(spec));
+
 	if (spec->type == CLI_OPT_TYPE_ARG)
 		return git_str_printf(out, "<%s>", spec->value_name);
 	if (spec->type == CLI_OPT_TYPE_ARGS)
 		return git_str_printf(out, "<%s>...", spec->value_name);
 	if (spec->type == CLI_OPT_TYPE_LITERAL)
 		return git_str_printf(out, "--");
-	if (spec->alias && !(spec->usage & CLI_OPT_USAGE_SHOW_LONG))
+
+	GIT_ASSERT(!"unknown option spec type");
+	return -1;
+}
+
+GIT_INLINE(int) print_spec_alias(git_str *out, const cli_opt_spec *spec)
+{
+	GIT_ASSERT(is_switch_or_value(spec) && spec->alias);
+
+	if (spec->type == CLI_OPT_TYPE_VALUE &&
+	    !(spec->usage & CLI_OPT_USAGE_VALUE_OPTIONAL))
+		return git_str_printf(out, "-%c <%s>", spec->alias, spec->value_name);
+	else if (spec->type == CLI_OPT_TYPE_VALUE)
+		return git_str_printf(out, "-%c [<%s>]", spec->alias, spec->value_name);
+	else
 		return git_str_printf(out, "-%c", spec->alias);
-	if (spec->name)
+}
+
+GIT_INLINE(int) print_spec_name(git_str *out, const cli_opt_spec *spec)
+{
+	GIT_ASSERT(is_switch_or_value(spec) && spec->name);
+
+	if (spec->type == CLI_OPT_TYPE_VALUE &&
+	    !(spec->usage & CLI_OPT_USAGE_VALUE_OPTIONAL))
+		return git_str_printf(out, "--%s=<%s>", spec->name, spec->value_name);
+	else if (spec->type == CLI_OPT_TYPE_VALUE)
+		return git_str_printf(out, "--%s[=<%s>]", spec->name, spec->value_name);
+	else
 		return git_str_printf(out, "--%s", spec->name);
+}
+
+GIT_INLINE(int) print_spec_full(git_str *out, const cli_opt_spec *spec)
+{
+	int error = 0;
 
-	GIT_ASSERT(0);
+	if (is_switch_or_value(spec)) {
+		if (spec->alias)
+			error |= print_spec_alias(out, spec);
+
+		if (spec->alias && spec->name)
+			error |= git_str_printf(out, ", ");
+
+		if (spec->name)
+			error |= print_spec_name(out, spec);
+	} else {
+		error |= print_spec_args(out, spec);
+	}
+
+	return error;
+}
+
+GIT_INLINE(int) print_spec(git_str *out, const cli_opt_spec *spec)
+{
+	if (is_switch_or_value(spec)) {
+		if (spec->alias && !(spec->usage & CLI_OPT_USAGE_SHOW_LONG))
+			return print_spec_alias(out, spec);
+		else
+			return print_spec_name(out, spec);
+	}
+
+	return print_spec_args(out, spec);
 }
 
 /*
@@ -46,7 +95,8 @@ int cli_opt_usage_fprint(
 	FILE *file,
 	const char *command,
 	const char *subcommand,
-	const cli_opt_spec specs[])
+	const cli_opt_spec specs[],
+	unsigned int print_flags)
 {
 	git_str usage = GIT_BUF_INIT, opt = GIT_BUF_INIT;
 	const cli_opt_spec *spec;
@@ -55,7 +105,7 @@ int cli_opt_usage_fprint(
 	int error;
 
 	/* TODO: query actual console width. */
-	int console_width = 80;
+	int console_width = 78;
 
 	if ((error = git_str_printf(&usage, "usage: %s", command)) < 0)
 		goto done;
@@ -73,7 +123,8 @@ int cli_opt_usage_fprint(
 
 		next_choice = !!((spec + 1)->usage & CLI_OPT_USAGE_CHOICE);
 
-		if (spec->usage & CLI_OPT_USAGE_HIDDEN)
+		if ((spec->usage & CLI_OPT_USAGE_HIDDEN) &&
+		    !(print_flags & CLI_OPT_USAGE_SHOW_HIDDEN))
 			continue;
 
 		if (choice)
@@ -86,7 +137,7 @@ int cli_opt_usage_fprint(
 		if (!optional && !choice && next_choice)
 			git_str_putc(&opt, '(');
 
-		if ((error = print_spec_name(&opt, spec)) < 0)
+		if ((error = print_spec(&opt, spec)) < 0)
 			goto done;
 
 		if (!optional && choice && !next_choice)
@@ -111,11 +162,11 @@ int cli_opt_usage_fprint(
 				git_str_putc(&usage, ' ');
 
 			linelen = prefixlen;
-		} else {
-			git_str_putc(&usage, ' ');
-			linelen += git_str_len(&opt) + 1;
 		}
 
+		git_str_putc(&usage, ' ');
+		linelen += git_str_len(&opt) + 1;
+
 		git_str_puts(&usage, git_str_cstr(&opt));
 
 		if (git_str_oom(&usage)) {
@@ -140,7 +191,7 @@ int cli_opt_usage_error(
 	const cli_opt *invalid_opt)
 {
 	cli_opt_status_fprint(stderr, PROGRAM_NAME, invalid_opt);
-	cli_opt_usage_fprint(stderr, PROGRAM_NAME, subcommand, specs);
+	cli_opt_usage_fprint(stderr, PROGRAM_NAME, subcommand, specs, 0);
 	return CLI_EXIT_USAGE;
 }
 
@@ -150,35 +201,53 @@ int cli_opt_help_fprint(
 {
 	git_str help = GIT_BUF_INIT;
 	const cli_opt_spec *spec;
+	bool required;
 	int error = 0;
 
 	/* Display required arguments first */
 	for (spec = specs; spec->type; ++spec) {
-		if (! (spec->usage & CLI_OPT_USAGE_REQUIRED) ||
-		    (spec->usage & CLI_OPT_USAGE_HIDDEN))
+		if ((spec->usage & CLI_OPT_USAGE_HIDDEN) ||
+		    (spec->type == CLI_OPT_TYPE_LITERAL))
+			continue;
+
+		required = ((spec->usage & CLI_OPT_USAGE_REQUIRED) ||
+		    ((spec->usage & CLI_OPT_USAGE_CHOICE) && required));
+
+		if (!required)
 			continue;
 
 		git_str_printf(&help, "    ");
 
-		if ((error = print_spec_name(&help, spec)) < 0)
+		if ((error = print_spec_full(&help, spec)) < 0)
 			goto done;
 
-		git_str_printf(&help, ": %s\n", spec->help);
+		git_str_printf(&help, "\n");
+
+		if (spec->help)
+			git_str_printf(&help, "        %s\n", spec->help);
 	}
 
 	/* Display the remaining arguments */
 	for (spec = specs; spec->type; ++spec) {
-		if ((spec->usage & CLI_OPT_USAGE_REQUIRED) ||
-		    (spec->usage & CLI_OPT_USAGE_HIDDEN))
+		if ((spec->usage & CLI_OPT_USAGE_HIDDEN) ||
+		    (spec->type == CLI_OPT_TYPE_LITERAL))
+			continue;
+
+		required = ((spec->usage & CLI_OPT_USAGE_REQUIRED) ||
+		    ((spec->usage & CLI_OPT_USAGE_CHOICE) && required));
+
+		if (required)
 			continue;
 
 		git_str_printf(&help, "    ");
 
-		if ((error = print_spec_name(&help, spec)) < 0)
+		if ((error = print_spec_full(&help, spec)) < 0)
 			goto done;
 
-		git_str_printf(&help, ": %s\n", spec->help);
+		git_str_printf(&help, "\n");
 
+		if (spec->help)
+			git_str_printf(&help, "        %s\n", spec->help);
 	}
 
 	if (git_str_oom(&help) ||