From: Junio C Hamano <gitster@pobox•com>
To: David Aguilar <davvid@gmail•com>
Cc: git@vger•kernel.org, "Jeff King" <peff@peff•net>,
"Jonathan Nieder" <jrnieder@gmail•com>,
"René Scharfe" <l.s.r@web•de>,
"Matthieu Moy" <Matthieu.Moy@grenoble-inp•fr>
Subject: Re: [PATCH 1/2] check-headers: add header usage checks for .c files
Date: Mon, 15 Sep 2014 12:19:06 -0700 [thread overview]
Message-ID: <xmqqfvfs66ad.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqqk35466e1.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Mon, 15 Sep 2014 12:16:54 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> David Aguilar <davvid@gmail•com> writes:
>
>> Teach check-header.sh to ensure that the first included header in .c
>> files is either git-compat-util.h, builtin.h, or cache.h.
>>
>> Ensure that common-cmds.h is only included by help.c.
>>
>> Move the logic into functions so that we can skip parts of the check.
>>
>> Signed-off-by: David Aguilar <davvid@gmail•com>
>> ---
>> This depends on my previous patch that adds check-header.sh.
>> ...
>> +check_headers () {
>> + for header in *.h ewah/*.h vcs-svn/*.h xdiff/*.h
>> + do
>> + check_header "$header"
>
> Hmmmm, doesn't check_header run "$@" as a command?
Taking the previous two together, perhaps
| 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
--git a/check-headers.sh b/check-headers.sh
index 7f25e7a..526381e 100755
--- a/check-headers.sh
+++ b/check-headers.sh
@@ -20,6 +20,7 @@ maybe_exit () {
check_header () {
header="$1"
+ shift
case "$header" in
common-cmds.h)
# should only be included by help.c, not checked
@@ -38,15 +39,17 @@ check_header () {
check_headers () {
for header in *.h ewah/*.h vcs-svn/*.h xdiff/*.h
do
- check_header "$header"
+ check_header "$header" "$@"
done
}
check_header_usage () {
- first=$(grep '^#include' "$1" |
- head -n1 |
- sed -e 's,#include ",,' -e 's,"$,,')
-
+ first=$(
+ sed -n -e '/^#include/{
+ s/#include ["<]\(.*\)".*/\1/p
+ q
+ }' "$1"
+ )
case "$first" in
cache.h|builtin.h|git-compat-util.h)
# happy
next prev parent reply other threads:[~2014-09-15 19:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-14 7:40 [PATCH 1/2] check-headers: add header usage checks for .c files David Aguilar
2014-09-14 7:40 ` [PATCH 2/2] cleanups: ensure that git-compat-util.h is included first David Aguilar
2014-09-15 19:14 ` [PATCH 1/2] check-headers: add header usage checks for .c files Junio C Hamano
2014-09-15 19:16 ` Junio C Hamano
2014-09-15 19:19 ` Junio C Hamano [this message]
2014-09-15 19:49 ` David Aguilar
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=xmqqfvfs66ad.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Matthieu.Moy@grenoble-inp$(echo .)fr \
--cc=davvid@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jrnieder@gmail$(echo .)com \
--cc=l.s.r@web$(echo .)de \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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