From: "Sébastien Guimmara" <sebastien.guimmara@gmail.com>
To: git@vger.kernel.org, sunshine@sunshineco.com, gitster@pobox.com
Cc: "Sébastien Guimmara" <sebastien.guimmara@gmail.com>
Subject: [PATCH 1/5] command-list.txt: prepare with [commands] header
Date: Thu, 14 May 2015 14:59:06 +0200 [thread overview]
Message-ID: <1431608351-9413-2-git-send-email-sebastien.guimmara@gmail.com> (raw)
In-Reply-To: <1431608351-9413-1-git-send-email-sebastien.guimmara@gmail.com>
Add a [commands] header before the actual command list, then make the
following files ignore this header in their parsing:
* cmd-list.perl
* Makefile (check-docks target)
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Sébastien Guimmara <sebastien.guimmara@gmail.com>
---
Documentation/cmd-list.perl | 4 ++++
Makefile | 3 ++-
command-list.txt | 1 +
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl
index 04f9977..06a5fd6 100755
--- a/Documentation/cmd-list.perl
+++ b/Documentation/cmd-list.perl
@@ -38,6 +38,10 @@ sub format_one {
}
}
+while (<>) {
+ last if /^\[commands\]/;
+}
+
my %cmds = ();
for (sort <>) {
next if /^#/;
diff --git a/Makefile b/Makefile
index 5f3987f..7c57369 100644
--- a/Makefile
+++ b/Makefile
@@ -2447,7 +2447,7 @@ check-docs::
esac ; \
test -f "Documentation/$$v.txt" || \
echo "no doc: $$v"; \
- sed -e '/^#/d' command-list.txt | \
+ sed -e '1,/^\[commands\]/d' -e '/^#/d' <command-list.txt | \
grep -q "^$$v[ ]" || \
case "$$v" in \
git) ;; \
@@ -2456,6 +2456,7 @@ check-docs::
done; \
( \
sed -e '/^#/d' \
+ -e '1,/^\[commands\]/d' \
-e 's/[ ].*//' \
-e 's/^/listed /' command-list.txt; \
$(MAKE) -C Documentation print-man1 | \
diff --git a/command-list.txt b/command-list.txt
index f1eae08..40fbe2f 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -1,5 +1,6 @@
# List of known git commands.
# command name category [deprecated] [common]
+[commands]
git-add mainporcelain common
git-am mainporcelain
git-annotate ancillaryinterrogators
--
2.4.0
next prev parent reply other threads:[~2015-05-14 13:00 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-14 12:59 [PATCH 0/5] git help: group common commands by theme Sébastien Guimmara
2015-05-14 12:59 ` Sébastien Guimmara [this message]
2015-05-14 12:59 ` [PATCH 2/5] command-list.txt: add with [common] block Sébastien Guimmara
2015-05-14 12:59 ` [PATCH 3/5] generate-cmdlist: parse common group commands Sébastien Guimmara
2015-05-14 20:58 ` Junio C Hamano
2015-05-14 21:05 ` Eric Sunshine
2015-05-15 14:40 ` Sébastien Guimmara
2015-05-14 12:59 ` [PATCH 4/5] command-list.txt: drop the common- prefix Sébastien Guimmara
2015-05-14 12:59 ` [PATCH 5/5] help.c: output the typical Git workflow Sébastien Guimmara
2015-05-14 12:59 ` Sébastien Guimmara
2015-05-14 20:51 ` [PATCH 0/5] git help: group common commands by theme Junio C Hamano
2015-05-15 14:37 ` Sébastien Guimmara
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1431608351-9413-2-git-send-email-sebastien.guimmara@gmail.com \
--to=sebastien.guimmara@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/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.
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 NNTP newsgroup(s).