| Message ID | 20191210023335.49987-2-emilyshaffer@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | configuration-based hook management | expand |
On Tue, Dec 10, 2019 at 3:34 AM Emily Shaffer <emilyshaffer@google.com> wrote: > > Introduce infrastructure for a new subcommand, git-hook, which will be > used to ease config-based hook management. This command will handle > parsing configs to compose a list of hooks to run for a given event, as > well as adding or modifying hook configs in an interactive fashion. > > Signed-off-by: Emily Shaffer <emilyshaffer@google.com> > --- > .gitignore | 1 + > Documentation/git-hook.txt | 19 +++++++++++++++++++ > Makefile | 1 + > builtin.h | 1 + > builtin/hook.c | 21 +++++++++++++++++++++ > git.c | 1 + how about adding also completion support here? Bert > t/t1360-config-based-hooks.sh | 11 +++++++++++ > 7 files changed, 55 insertions(+) > create mode 100644 Documentation/git-hook.txt > create mode 100644 builtin/hook.c > create mode 100755 t/t1360-config-based-hooks.sh > > diff --git a/.gitignore b/.gitignore > index 89b3b79c1a..9ef59b9baa 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -74,6 +74,7 @@ > /git-grep > /git-hash-object > /git-help > +/git-hook > /git-http-backend > /git-http-fetch > /git-http-push > diff --git a/Documentation/git-hook.txt b/Documentation/git-hook.txt > new file mode 100644 > index 0000000000..2d50c414cc > --- /dev/null > +++ b/Documentation/git-hook.txt > @@ -0,0 +1,19 @@ > +git-hook(1) > +=========== > + > +NAME > +---- > +git-hook - Manage configured hooks > + > +SYNOPSIS > +-------- > +[verse] > +'git hook' > + > +DESCRIPTION > +----------- > +You can list, add, and modify hooks with this command. > + > +GIT > +--- > +Part of the linkgit:git[1] suite > diff --git a/Makefile b/Makefile > index 58b92af54b..83263505c0 100644 > --- a/Makefile > +++ b/Makefile > @@ -1074,6 +1074,7 @@ BUILTIN_OBJS += builtin/get-tar-commit-id.o > BUILTIN_OBJS += builtin/grep.o > BUILTIN_OBJS += builtin/hash-object.o > BUILTIN_OBJS += builtin/help.o > +BUILTIN_OBJS += builtin/hook.o > BUILTIN_OBJS += builtin/index-pack.o > BUILTIN_OBJS += builtin/init-db.o > BUILTIN_OBJS += builtin/interpret-trailers.o > diff --git a/builtin.h b/builtin.h > index 5cf5df69f7..d4ca2ac9a5 100644 > --- a/builtin.h > +++ b/builtin.h > @@ -173,6 +173,7 @@ int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix); > int cmd_grep(int argc, const char **argv, const char *prefix); > int cmd_hash_object(int argc, const char **argv, const char *prefix); > int cmd_help(int argc, const char **argv, const char *prefix); > +int cmd_hook(int argc, const char **argv, const char *prefix); > int cmd_index_pack(int argc, const char **argv, const char *prefix); > int cmd_init_db(int argc, const char **argv, const char *prefix); > int cmd_interpret_trailers(int argc, const char **argv, const char *prefix); > diff --git a/builtin/hook.c b/builtin/hook.c > new file mode 100644 > index 0000000000..b2bbc84d4d > --- /dev/null > +++ b/builtin/hook.c > @@ -0,0 +1,21 @@ > +#include "cache.h" > + > +#include "builtin.h" > +#include "parse-options.h" > + > +static const char * const builtin_hook_usage[] = { > + N_("git hook"), > + NULL > +}; > + > +int cmd_hook(int argc, const char **argv, const char *prefix) > +{ > + struct option builtin_hook_options[] = { > + OPT_END(), > + }; > + > + argc = parse_options(argc, argv, prefix, builtin_hook_options, > + builtin_hook_usage, 0); > + > + return 0; > +} > diff --git a/git.c b/git.c > index ce6ab0ece2..c8344b9ab7 100644 > --- a/git.c > +++ b/git.c > @@ -513,6 +513,7 @@ static struct cmd_struct commands[] = { > { "grep", cmd_grep, RUN_SETUP_GENTLY }, > { "hash-object", cmd_hash_object }, > { "help", cmd_help }, > + { "hook", cmd_hook, RUN_SETUP }, > { "index-pack", cmd_index_pack, RUN_SETUP_GENTLY | NO_PARSEOPT }, > { "init", cmd_init_db }, > { "init-db", cmd_init_db }, > diff --git a/t/t1360-config-based-hooks.sh b/t/t1360-config-based-hooks.sh > new file mode 100755 > index 0000000000..34b0df5216 > --- /dev/null > +++ b/t/t1360-config-based-hooks.sh > @@ -0,0 +1,11 @@ > +#!/bin/bash > + > +test_description='config-managed multihooks, including git-hook command' > + > +. ./test-lib.sh > + > +test_expect_success 'git hook command does not crash' ' > + git hook > +' > + > +test_done > -- > 2.24.0.393.g34dc348eaf-goog >
On Mon, Dec 09, 2019 at 06:33:30PM -0800, Emily Shaffer wrote: > Introduce infrastructure for a new subcommand, git-hook, which will be > used to ease config-based hook management. This command will handle > parsing configs to compose a list of hooks to run for a given event, as > well as adding or modifying hook configs in an interactive fashion. > > Signed-off-by: Emily Shaffer <emilyshaffer@google.com> > --- > .gitignore | 1 + > Documentation/git-hook.txt | 19 +++++++++++++++++++ > Makefile | 1 + > builtin.h | 1 + > builtin/hook.c | 21 +++++++++++++++++++++ > git.c | 1 + > t/t1360-config-based-hooks.sh | 11 +++++++++++ > 7 files changed, 55 insertions(+) > create mode 100644 Documentation/git-hook.txt > create mode 100644 builtin/hook.c > create mode 100755 t/t1360-config-based-hooks.sh When adding a new command please don't forget the steps noted in 4ed5562925 (myfirstcontrib: add 'psuh' to command-list.txt, 2019-10-31) ;) > diff --git a/t/t1360-config-based-hooks.sh b/t/t1360-config-based-hooks.sh > new file mode 100755 > index 0000000000..34b0df5216 > --- /dev/null > +++ b/t/t1360-config-based-hooks.sh > @@ -0,0 +1,11 @@ > +#!/bin/bash s/ba// > + > +test_description='config-managed multihooks, including git-hook command' > + > +. ./test-lib.sh > + > +test_expect_success 'git hook command does not crash' ' > + git hook > +' > + > +test_done > -- > 2.24.0.393.g34dc348eaf-goog >
diff --git a/.gitignore b/.gitignore index 89b3b79c1a..9ef59b9baa 100644 --- a/.gitignore +++ b/.gitignore @@ -74,6 +74,7 @@ /git-grep /git-hash-object /git-help +/git-hook /git-http-backend /git-http-fetch /git-http-push diff --git a/Documentation/git-hook.txt b/Documentation/git-hook.txt new file mode 100644 index 0000000000..2d50c414cc --- /dev/null +++ b/Documentation/git-hook.txt @@ -0,0 +1,19 @@ +git-hook(1) +=========== + +NAME +---- +git-hook - Manage configured hooks + +SYNOPSIS +-------- +[verse] +'git hook' + +DESCRIPTION +----------- +You can list, add, and modify hooks with this command. + +GIT +--- +Part of the linkgit:git[1] suite diff --git a/Makefile b/Makefile index 58b92af54b..83263505c0 100644 --- a/Makefile +++ b/Makefile @@ -1074,6 +1074,7 @@ BUILTIN_OBJS += builtin/get-tar-commit-id.o BUILTIN_OBJS += builtin/grep.o BUILTIN_OBJS += builtin/hash-object.o BUILTIN_OBJS += builtin/help.o +BUILTIN_OBJS += builtin/hook.o BUILTIN_OBJS += builtin/index-pack.o BUILTIN_OBJS += builtin/init-db.o BUILTIN_OBJS += builtin/interpret-trailers.o diff --git a/builtin.h b/builtin.h index 5cf5df69f7..d4ca2ac9a5 100644 --- a/builtin.h +++ b/builtin.h @@ -173,6 +173,7 @@ int cmd_get_tar_commit_id(int argc, const char **argv, const char *prefix); int cmd_grep(int argc, const char **argv, const char *prefix); int cmd_hash_object(int argc, const char **argv, const char *prefix); int cmd_help(int argc, const char **argv, const char *prefix); +int cmd_hook(int argc, const char **argv, const char *prefix); int cmd_index_pack(int argc, const char **argv, const char *prefix); int cmd_init_db(int argc, const char **argv, const char *prefix); int cmd_interpret_trailers(int argc, const char **argv, const char *prefix); diff --git a/builtin/hook.c b/builtin/hook.c new file mode 100644 index 0000000000..b2bbc84d4d --- /dev/null +++ b/builtin/hook.c @@ -0,0 +1,21 @@ +#include "cache.h" + +#include "builtin.h" +#include "parse-options.h" + +static const char * const builtin_hook_usage[] = { + N_("git hook"), + NULL +}; + +int cmd_hook(int argc, const char **argv, const char *prefix) +{ + struct option builtin_hook_options[] = { + OPT_END(), + }; + + argc = parse_options(argc, argv, prefix, builtin_hook_options, + builtin_hook_usage, 0); + + return 0; +} diff --git a/git.c b/git.c index ce6ab0ece2..c8344b9ab7 100644 --- a/git.c +++ b/git.c @@ -513,6 +513,7 @@ static struct cmd_struct commands[] = { { "grep", cmd_grep, RUN_SETUP_GENTLY }, { "hash-object", cmd_hash_object }, { "help", cmd_help }, + { "hook", cmd_hook, RUN_SETUP }, { "index-pack", cmd_index_pack, RUN_SETUP_GENTLY | NO_PARSEOPT }, { "init", cmd_init_db }, { "init-db", cmd_init_db }, diff --git a/t/t1360-config-based-hooks.sh b/t/t1360-config-based-hooks.sh new file mode 100755 index 0000000000..34b0df5216 --- /dev/null +++ b/t/t1360-config-based-hooks.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +test_description='config-managed multihooks, including git-hook command' + +. ./test-lib.sh + +test_expect_success 'git hook command does not crash' ' + git hook +' + +test_done
Introduce infrastructure for a new subcommand, git-hook, which will be used to ease config-based hook management. This command will handle parsing configs to compose a list of hooks to run for a given event, as well as adding or modifying hook configs in an interactive fashion. Signed-off-by: Emily Shaffer <emilyshaffer@google.com> --- .gitignore | 1 + Documentation/git-hook.txt | 19 +++++++++++++++++++ Makefile | 1 + builtin.h | 1 + builtin/hook.c | 21 +++++++++++++++++++++ git.c | 1 + t/t1360-config-based-hooks.sh | 11 +++++++++++ 7 files changed, 55 insertions(+) create mode 100644 Documentation/git-hook.txt create mode 100644 builtin/hook.c create mode 100755 t/t1360-config-based-hooks.sh