From mboxrd@z Thu Jan 1 00:00:00 1970 From: Philip Oakley Subject: [PATCH v2 3/5] Help.c add --guide option Date: Sun, 3 Mar 2013 23:44:18 +0000 Message-ID: <1362354260-3772-4-git-send-email-philipoakley@iee.org> References: <1362354260-3772-1-git-send-email-philipoakley@iee.org> Cc: Junio C Hamano , "W. Trevor King" , David Aguilar To: GitList X-From: git-owner@vger.kernel.org Mon Mar 04 00:44:25 2013 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1UCIZn-0005LE-Pc for gcvg-git-2@plane.gmane.org; Mon, 04 Mar 2013 00:44:20 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754798Ab3CCXnn (ORCPT ); Sun, 3 Mar 2013 18:43:43 -0500 Received: from out1.ip01ir2.opaltelecom.net ([62.24.128.237]:56134 "EHLO out1.ip01ir2.opaltelecom.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754760Ab3CCXni (ORCPT ); Sun, 3 Mar 2013 18:43:38 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ah4FAK7TM1FZ8rke/2dsb2JhbABFhWe8Y30Xc4IgAQVWIxAISTkeBhOIF8cUjx0Hg0ADpzKDCA X-IronPort-AV: E=Sophos;i="4.84,774,1355097600"; d="scan'208";a="420962503" Received: from host-89-242-185-30.as13285.net (HELO localhost) ([89.242.185.30]) by out1.ip01ir2.opaltelecom.net with ESMTP; 03 Mar 2013 23:43:37 +0000 X-Mailer: git-send-email 1.8.1.msysgit.1 In-Reply-To: <1362354260-3772-1-git-send-email-philipoakley@iee.org> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: 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 --- 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