From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Emily Shaffer" <emilyshaffer@google.com>,
"Jeff King" <peff@peff.net>,
"Phillip Wood" <phillip.wood123@gmail.com>,
"René Scharfe" <l.s.r@web.de>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 0/8] Makefile: generate a hook-list.h, prep for config-based-hooks
Date: Sun, 26 Sep 2021 21:03:21 +0200 [thread overview]
Message-ID: <cover-v2-0.8-00000000000-20210926T185800Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.8-00000000000-20210923T095326Z-avarab@gmail.com>
This series is an incremental restart of the now-ejected
es/config-based-hooks and ab/config-based-hooks-base topics. See [1]
for a summary of the plan and progression.
In v2 the "sed" invocation that generates the new hook-list.h has been
changed to be portable under POSIX. See the thread starting at
https://lore.kernel.org/git/92471ff9-7573-c3e4-e9fd-63a5cbf5738f@gmail.com/;
The portability issue is AFAICT theoretical in that any "sed" command
I've tried accepts the old version (I tried the large list of OS's
listed in [2]), but better safe than sorry.
Other changes:
* I noticed that the run-command.h inclusion in transport.c become
redundant, I removed that and validated the other ones that have
the new hook.h, they all still need run-command.h.
* A whitespace change in v1 in a change to the Makefile makes the
diff for 8/8 easier to read.
1. http://lore.kernel.org/git/cover-0.8-00000000000-20210923T095326Z-avarab@gmail.com
2. https://lore.kernel.org/git/87fstt3gzd.fsf@evledraar.gmail.com/
Emily Shaffer (1):
hook.c: add a hook_exists() wrapper and use it in bugreport.c
Ævar Arnfjörð Bjarmason (7):
Makefile: mark "check" target as .PHONY
Makefile: stop hardcoding {command,config}-list.h
Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H)
Makefile: remove an out-of-date comment
hook.[ch]: move find_hook() from run-command.c to hook.c
hook.c users: use "hook_exists()" instead of "find_hook()"
hook-list.h: add a generated list of hooks, like config-list.h
.gitignore | 1 +
Makefile | 28 ++++++++++--------
builtin/am.c | 1 +
builtin/bugreport.c | 46 ++++++-----------------------
builtin/commit.c | 3 +-
builtin/merge.c | 3 +-
builtin/receive-pack.c | 3 +-
builtin/worktree.c | 1 +
compat/vcbuild/README | 2 +-
config.mak.uname | 6 ++--
contrib/buildsystems/CMakeLists.txt | 7 +++++
generate-hooklist.sh | 20 +++++++++++++
hook.c | 42 ++++++++++++++++++++++++++
hook.h | 16 ++++++++++
refs.c | 1 +
run-command.c | 35 +---------------------
run-command.h | 7 -----
sequencer.c | 3 +-
transport.c | 2 +-
19 files changed, 127 insertions(+), 100 deletions(-)
create mode 100755 generate-hooklist.sh
create mode 100644 hook.c
create mode 100644 hook.h
Range-diff against v1:
1: 91d0cd09c8e = 1: 095ef66c29e Makefile: mark "check" target as .PHONY
2: 804795771c6 = 2: 520e4baede6 Makefile: stop hardcoding {command,config}-list.h
3: 010701fd784 = 3: 312b353c651 Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H)
4: b3cce74d259 = 4: aea4868f988 Makefile: remove an out-of-date comment
5: 7dd874d50ec ! 5: 64f3af94161 hook.[ch]: move find_hook() from run-command.c to hook.c
@@ sequencer.c
## transport.c ##
@@
+ #include "cache.h"
#include "config.h"
#include "transport.h"
- #include "run-command.h"
+-#include "run-command.h"
+#include "hook.h"
#include "pkt-line.h"
#include "fetch-pack.h"
6: db8893afee6 = 6: 4eabe7ca39f hook.c: add a hook_exists() wrapper and use it in bugreport.c
7: b61130dee5b = 7: 6237a1a5549 hook.c users: use "hook_exists()" instead of "find_hook()"
8: 80aae4d5c13 ! 8: 7420267ce09 hook-list.h: add a generated list of hooks, like config-list.h
@@ Makefile: XDIFF_LIB = xdiff/lib.a
generated-hdrs: $(GENERATED_H)
@@ Makefile: git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
+ $(filter %.o,$^) $(LIBS)
help.sp help.s help.o: command-list.h
++hook.sp hook.s hook.o: hook-list.h
-builtin/help.sp builtin/help.s builtin/help.o: config-list.h GIT-PREFIX
-+hook.sp hook.s hook.o: hook-list.h
-+
+builtin/help.sp builtin/help.s builtin/help.o: config-list.h hook-list.h GIT-PREFIX
builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
'-DGIT_HTML_PATH="$(htmldir_relative_SQ)"' \
@@ generate-hooklist.sh (new)
+static const char *hook_name_list[] = {
+EOF
+
-+sed -n -e '/^~~~~*$/ {x; s/^.*$/ "&",/; p;}; x' \
++sed -n \
++ -e '/^~~~~*$/ {x; s/^.*$/ "&",/; p;}' \
++ -e 'x' \
+ <Documentation/githooks.txt |
+ LC_ALL=C sort
+
--
2.33.0.1291.g8857a6a91ac
next prev parent reply other threads:[~2021-09-26 19:03 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-23 10:29 [PATCH 0/8] Makefile: generate a hook-list.h, prep for config-based-hooks Ævar Arnfjörð Bjarmason
2021-09-23 10:29 ` [PATCH 1/8] Makefile: mark "check" target as .PHONY Ævar Arnfjörð Bjarmason
2021-09-23 10:29 ` [PATCH 2/8] Makefile: stop hardcoding {command,config}-list.h Ævar Arnfjörð Bjarmason
2021-09-23 10:29 ` [PATCH 3/8] Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H) Ævar Arnfjörð Bjarmason
2021-09-23 10:29 ` [PATCH 4/8] Makefile: remove an out-of-date comment Ævar Arnfjörð Bjarmason
2021-09-23 10:30 ` [PATCH 5/8] hook.[ch]: move find_hook() from run-command.c to hook.c Ævar Arnfjörð Bjarmason
2021-09-23 10:30 ` [PATCH 6/8] hook.c: add a hook_exists() wrapper and use it in bugreport.c Ævar Arnfjörð Bjarmason
2021-09-23 10:30 ` [PATCH 7/8] hook.c users: use "hook_exists()" instead of "find_hook()" Ævar Arnfjörð Bjarmason
2021-09-23 10:30 ` [PATCH 8/8] hook-list.h: add a generated list of hooks, like config-list.h Ævar Arnfjörð Bjarmason
2021-09-24 10:19 ` Phillip Wood
2021-09-24 15:51 ` Junio C Hamano
2021-09-24 16:39 ` René Scharfe
2021-09-24 19:30 ` Ævar Arnfjörð Bjarmason
2021-09-24 19:56 ` René Scharfe
2021-09-24 20:09 ` Ævar Arnfjörð Bjarmason
2021-09-27 9:24 ` Phillip Wood
2021-09-27 10:36 ` Ævar Arnfjörð Bjarmason
2021-11-15 22:04 ` Mike Hommey
2021-11-15 22:26 ` Ævar Arnfjörð Bjarmason
2021-11-15 22:40 ` Mike Hommey
2021-11-15 22:49 ` Ævar Arnfjörð Bjarmason
2021-11-15 23:00 ` Mike Hommey
2021-11-16 12:01 ` Ævar Arnfjörð Bjarmason
2021-11-17 8:39 ` Junio C Hamano
2021-09-26 19:03 ` Ævar Arnfjörð Bjarmason [this message]
2021-09-26 19:03 ` [PATCH v2 1/8] Makefile: mark "check" target as .PHONY Ævar Arnfjörð Bjarmason
2021-09-26 19:03 ` [PATCH v2 2/8] Makefile: stop hardcoding {command,config}-list.h Ævar Arnfjörð Bjarmason
2021-09-26 19:03 ` [PATCH v2 3/8] Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H) Ævar Arnfjörð Bjarmason
2021-09-26 19:03 ` [PATCH v2 4/8] Makefile: remove an out-of-date comment Ævar Arnfjörð Bjarmason
2021-09-26 19:03 ` [PATCH v2 5/8] hook.[ch]: move find_hook() from run-command.c to hook.c Ævar Arnfjörð Bjarmason
2021-09-26 19:03 ` [PATCH v2 6/8] hook.c: add a hook_exists() wrapper and use it in bugreport.c Ævar Arnfjörð Bjarmason
2021-09-26 19:03 ` [PATCH v2 7/8] hook.c users: use "hook_exists()" instead of "find_hook()" Ævar Arnfjörð Bjarmason
2021-09-26 19:03 ` [PATCH v2 8/8] hook-list.h: add a generated list of hooks, like config-list.h Ævar Arnfjörð Bjarmason
2021-09-27 16:48 ` Junio C Hamano
2021-09-27 18:00 ` René Scharfe
2021-09-27 20:23 ` Junio C Hamano
2021-09-27 9:30 ` [PATCH v2 0/8] Makefile: generate a hook-list.h, prep for config-based-hooks Phillip Wood
2021-09-27 10:38 ` Ævar Arnfjörð Bjarmason
2021-09-27 18:01 ` Phillip Wood
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=cover-v2-0.8-00000000000-20210926T185800Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=peff@peff.net \
--cc=phillip.wood123@gmail.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.
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).