From: Philip Oakley <philipoakley@iee.org>
To: GitList <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
"W. Trevor King" <wking@tremily.us>,
David Aguilar <davvid@gmail.com>
Subject: [PATCH v2 3/5] Help.c add --guide option
Date: Sun, 3 Mar 2013 23:44:18 +0000 [thread overview]
Message-ID: <1362354260-3772-4-git-send-email-philipoakley@iee.org> (raw)
In-Reply-To: <1362354260-3772-1-git-send-email-philipoakley@iee.org>
Logic, but no actions, included.
The --all commands option, if given, will display first.
The --guide option's list will then be displayed.
The common commands list is only displayed if neither option,
nor a command or guide name, is given.
Signed-off-by: Philip Oakley <philipoakley@iee.org>
---
builtin/help.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/builtin/help.c b/builtin/help.c
index d10cbed..6089d72 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -36,10 +36,12 @@ enum help_format {
static const char *html_path;
static int show_all = 0;
+static int show_guides = 0;
static unsigned int colopts;
static enum help_format help_format = HELP_FORMAT_NONE;
static struct option builtin_help_options[] = {
OPT_COUNTUP('a', "all", &show_all, N_("print all available commands")),
+ OPT_COUNTUP('g', "guides", &show_guides, N_("print list of useful guides")),
OPT_SET_INT('m', "man", &help_format, N_("show man page"), HELP_FORMAT_MAN),
OPT_SET_INT('w', "web", &help_format, N_("show manual in web browser"),
HELP_FORMAT_WEB),
@@ -49,7 +51,7 @@ static struct option builtin_help_options[] = {
};
static const char * const builtin_help_usage[] = {
- N_("git help [--all] [--man|--web|--info] [command]"),
+ N_("git help [--all] [--guides] [--man|--web|--info] [command]"),
NULL
};
@@ -429,9 +431,11 @@ int cmd_help(int argc, const char **argv, const char *prefix)
printf(_("usage: %s%s"), _(git_usage_string), "\n\n");
list_commands(colopts, &main_cmds, &other_cmds);
printf("%s\n", _(git_more_info_string));
+ if (!show_guides) return 0;
+ }
+ if (show_guides) {
return 0;
}
-
if (!argv[0]) {
printf(_("usage: %s%s"), _(git_usage_string), "\n\n");
list_common_cmds_help();
--
1.8.1.msysgit.1
next prev parent reply other threads:[~2013-03-03 23:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-03 23:44 [PATCH v2 0/5] [RESEND with Cc:] Git help option to list user guides Philip Oakley
2013-03-03 23:44 ` [PATCH v2 1/5] Show 'git help <guide>' usage, with examples Philip Oakley
2013-03-03 23:44 ` [PATCH v2 2/5] Help.c use OPT_COUNTUP Philip Oakley
2013-03-03 23:44 ` Philip Oakley [this message]
2013-03-03 23:44 ` [PATCH v2 4/5] Help.c: add list_common_guides_help() function Philip Oakley
2013-03-03 23:44 ` [PATCH v2 5/5] Help doc: Include --guide option description Philip Oakley
-- strict thread matches above, loose matches on Subject: below --
2013-03-03 20:21 [PATCH v2 0/5] Git help option to list user guides Philip Oakley
2013-03-03 20:21 ` [PATCH v2 3/5] Help.c add --guide option Philip Oakley
2013-03-03 23:38 ` Junio C Hamano
2013-03-04 0:04 ` Philip Oakley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362354260-3772-4-git-send-email-philipoakley@iee.org \
--to=philipoakley@iee.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=wking@tremily.us \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).