[PATCH v6 08/17] merge: convert post-merge to use hook.h
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Dec 22, 2021, 03:59 UTC
- Message-ID
- <patch-v6-08.17-6f8d3754b4f-20211222T035755Z-avarab@gmail.com>
- In-Reply-To
- <cover-v6-00.17-00000000000-20211222T035755Z-avarab@gmail.com>
From: Emily Shaffer <emilyshaffer@google.com>
Teach post-merge to use the hook.h library instead of the run-command.h library to run hooks.
Signed-off-by: Emily Shaffer <emilyshaffer@google.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c index 5f0476b0b76..5be3009c2a2 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -487,7 +487,7 @@ static void finish(struct commit *head_commit, } /* Run a post-merge hook */ - run_hook_le(NULL, "post-merge", squash ? "1" : "0", NULL); + run_hooks_l("post-merge", squash ? "1" : "0", NULL); apply_autostash(git_path_merge_autostash(the_repository)); strbuf_release(&reflog_message);
-- 2.34.1.1146.gb52885e7c44