зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
330155ed8a
Коммит
07a348e746
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -1460,7 +1460,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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче