[v8,04/37] hook: include hookdir hook in list

Message ID	20210311021037.3001235-5-emilyshaffer@google.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> Date: Wed, 10 Mar 2021 18:10:04 -0800 In-Reply-To: <20210311021037.3001235-1-emilyshaffer@google.com> Message-Id: <20210311021037.3001235-5-emilyshaffer@google.com> Mime-Version: 1.0 References: <20210311021037.3001235-1-emilyshaffer@google.com> Subject: [PATCH v8 04/37] hook: include hookdir hook in list From: Emily Shaffer <emilyshaffer@google.com> To: git@vger.kernel.org Cc: Emily Shaffer <emilyshaffer@google.com> Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	config-based hooks \| expand [v8,00/37] config-based hooks [v8,01/37] doc: propose hooks managed by the config [v8,02/37] hook: scaffolding for git-hook subcommand [v8,03/37] hook: add list command [v8,04/37] hook: include hookdir hook in list [v8,05/37] hook: teach hook.runHookDir [v8,06/37] hook: implement hookcmd.<name>.skip [v8,07/37] parse-options: parse into strvec [v8,08/37] hook: add 'run' subcommand [v8,09/37] hook: introduce hook_exists() [v8,10/37] hook: support passing stdin to hooks [v8,11/37] run-command: allow stdin for run_processes_parallel [v8,12/37] hook: allow parallel hook execution [v8,13/37] hook: allow specifying working directory for hooks [v8,14/37] run-command: add stdin callback for parallelization [v8,15/37] hook: provide stdin by string_list or callback [v8,16/37] run-command: allow capturing of collated output [v8,17/37] hooks: allow callers to capture output [v8,18/37] commit: use config-based hooks [v8,19/37] am: convert applypatch hooks to use config [v8,20/37] merge: use config-based hooks for post-merge hook [v8,21/37] gc: use hook library for pre-auto-gc hook [v8,22/37] rebase: teach pre-rebase to use hook.h [v8,23/37] read-cache: convert post-index-change hook to use config [v8,24/37] receive-pack: convert push-to-checkout hook to hook.h [v8,25/37] git-p4: use 'git hook' to run hooks [v8,26/37] hooks: convert 'post-checkout' hook to hook library [v8,27/37] hook: convert 'post-rewrite' hook to config [v8,28/37] transport: convert pre-push hook to use config [v8,29/37] reference-transaction: look for hooks in config [v8,30/37] receive-pack: convert 'update' hook to hook.h [v8,31/37] proc-receive: acquire hook list from hook.h [v8,32/37] post-update: use hook.h library [v8,33/37] receive-pack: convert receive hooks to hook.h [v8,34/37] bugreport: use hook_exists instead of find_hook [v8,35/37] git-send-email: use 'git hook run' for 'sendemail-validate' [v8,36/37] run-command: stop thinking about hooks [v8,37/37] docs: unify githooks and git-hook manpages

diff --git a/builtin/hook.c b/builtin/hook.c index bb64cd77ca..c8fbfbb39d 100644 --- a/builtin/hook.c +++ b/builtin/hook.c @@ -40,10 +40,15 @@ static int list(int argc, const char **argv, const char *prefix) list_for_each(pos, head) { struct hook *item = list_entry(pos, struct hook, list); - if (item) + item = list_entry(pos, struct hook, list); + if (item) { + /* Don't translate 'hookdir' - it matches the config */ printf("%s: %s\n", - config_scope_name(item->origin), + (item->from_hookdir + ? "hookdir" + : config_scope_name(item->origin)), item->command.buf); + } } clear_hook_list(head); @@ -60,6 +65,8 @@ int cmd_hook(int argc, const char **argv, const char *prefix) if (argc < 2) usage_with_options(builtin_hook_usage, builtin_hook_options); + git_config(git_default_config, NULL); + if (!strcmp(argv[1], "list")) return list(argc - 1, argv + 1, prefix); diff --git a/hook.c b/hook.c index fede40e925..080e25696b 100644 --- a/hook.c +++ b/hook.c @@ -2,6 +2,7 @@ #include "hook.h" #include "config.h" +#include "run-command.h" void free_hook(struct hook *ptr) { @@ -35,6 +36,7 @@ static void append_or_move_hook(struct list_head *head, const char *command) to_add = xmalloc(sizeof(*to_add)); strbuf_init(&to_add->command, 0); strbuf_addstr(&to_add->command, command); + to_add->from_hookdir = 0; } /* re-set the scope so we show where an override was specified */ @@ -115,6 +117,21 @@ struct list_head* hook_list(const struct strbuf* hookname) git_config(hook_config_lookup, &cb_data); + if (have_git_dir()) { + const char *legacy_hook_path = find_hook(hookname->buf); + + /* Unconditionally add legacy hook, but annotate it. */ + if (legacy_hook_path) { + struct hook *legacy_hook; + + append_or_move_hook(hook_head, + absolute_path(legacy_hook_path)); + legacy_hook = list_entry(hook_head->prev, struct hook, + list); + legacy_hook->from_hookdir = 1; + } + } + strbuf_release(&hook_key); return hook_head; } diff --git a/hook.h b/hook.h index e48dfc6d27..a97d43670d 100644 --- a/hook.h +++ b/hook.h @@ -11,6 +11,7 @@ struct hook { enum config_scope origin; /* The literal command to run. */ struct strbuf command; + unsigned from_hookdir : 1; }; /* diff --git a/t/t1360-config-based-hooks.sh b/t/t1360-config-based-hooks.sh index 6e4a3e763f..0f12af4659 100755 --- a/t/t1360-config-based-hooks.sh +++ b/t/t1360-config-based-hooks.sh @@ -23,6 +23,14 @@ setup_hookcmd () { test_config_global hookcmd.abc.command "/path/abc" --add } +setup_hookdir () { + mkdir .git/hooks + write_script .git/hooks/pre-commit <<-EOF + echo \"Legacy Hook\" + EOF + test_when_finished rm -rf .git/hooks +} + test_expect_success 'git hook rejects commands without a mode' ' test_must_fail git hook pre-commit ' @@ -85,4 +93,15 @@ test_expect_success 'git hook list reorders on duplicate commands' ' test_cmp expected actual ' +test_expect_success 'git hook list shows hooks from the hookdir' ' + setup_hookdir && + + cat >expected <<-EOF && + hookdir: $(pwd)/.git/hooks/pre-commit + EOF + + git hook list pre-commit >actual && + test_cmp expected actual +' + test_done

[v8,04/37] hook: include hookdir hook in list

Commit Message

Comments

Patch