diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-09-26 21:03:28 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-09-27 09:44:54 -0700 |
commit | 07a348e7461afe9411004a0501034cb3ff1cdee8 (patch) | |
tree | a32c560bec3ad2619c621d52c79455d1dd66196a /builtin/merge.c | |
parent | hook.c: add a hook_exists() wrapper and use it in bugreport.c (diff) | |
download | tgif-07a348e7461afe9411004a0501034cb3ff1cdee8.tar.xz |
hook.c users: use "hook_exists()" instead of "find_hook()"
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.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
-rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index fe664f6a86..956b6259f2 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); |