Subject: Re: [PATCH v4 06/36] hook.c users: use "hook_exists()" insted of "find_hook()"

From: Emily Shaffer <[email-masked]>
Date: Thu, 19 Aug 2021 17:10:43 -0700

On Tue, Aug 03, 2021 at 09:38:32PM +0200, Ævar Arnfjörð Bjarmason wrote:
> 
> Use the new hook_exists() function instead of find_hook() where the
> latter was called in boolean contexts. This make subsequent changes in
> a series where we further refactor the hook API clearer, as we won't
> conflate wanting to get the path of the hook with checking for its
> existence.
> 

None of these callsites capture the return string from find_hook(), so
this looks fine.

> Signed-off-by: Ævar Arnfjörð Bjarmason <[email-masked]>
Reviewed-by: Emily Shaffer <[email-masked]>
> ---
>  builtin/commit.c       | 2 +-
>  builtin/merge.c        | 2 +-
>  builtin/receive-pack.c | 2 +-
>  sequencer.c            | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/builtin/commit.c b/builtin/commit.c
> index 51b07ee02ea..aa3c741efa9 100644
> --- a/builtin/commit.c
> +++ b/builtin/commit.c
> @@ -1052,7 +1052,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
>  		return 0;
>  	}
>  
> -	if (!no_verify && find_hook("pre-commit")) {
> +	if (!no_verify && hook_exists("pre-commit")) {
>  		/*
>  		 * Re-read the index as pre-commit hook could have updated it,
>  		 * and write it out as a tree.  We must do this before we invoke
> diff --git a/builtin/merge.c b/builtin/merge.c
> index be98d66b0a8..03f244dd5a0 100644
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -849,7 +849,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
>  	 * and write it out as a tree.  We must do this before we invoke
>  	 * the editor and after we invoke run_status above.
>  	 */
> -	if (find_hook("pre-merge-commit"))
> +	if (hook_exists("pre-merge-commit"))
>  		discard_cache();
>  	read_cache_from(index_file);
>  	strbuf_addbuf(&msg, &merge_msg);
> diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
> index 97aebdc15bd..91fa799b66e 100644
> --- a/builtin/receive-pack.c
> +++ b/builtin/receive-pack.c
> @@ -1464,7 +1464,7 @@ static const char *update_worktree(unsigned char *sha1, const struct worktree *w
>  
>  	strvec_pushf(&env, "GIT_DIR=%s", absolute_path(git_dir));
>  
> -	if (!find_hook(push_to_checkout_hook))
> +	if (!hook_exists(push_to_checkout_hook))
>  		retval = push_to_deploy(sha1, &env, work_tree);
>  	else
>  		retval = push_to_checkout(sha1, &env, work_tree);
> diff --git a/sequencer.c b/sequencer.c
> index ea4199d65a4..9aac08c1545 100644
> --- a/sequencer.c
> +++ b/sequencer.c
> @@ -1446,7 +1446,7 @@ static int try_to_commit(struct repository *r,
>  		}
>  	}
>  
> -	if (find_hook("prepare-commit-msg")) {
> +	if (hook_exists("prepare-commit-msg")) {
>  		res = run_prepare_commit_msg_hook(r, msg, hook_commit);
>  		if (res)
>  			goto out;
> -- 
> 2.33.0.rc0.595.ge31e012651d
>