diff options
| author |  Emily Shaffer <emilyshaffer@google.com> | 2021-12-22 04:59:34 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2022-01-07 15:19:34 -0800 |
| commit | 67ad630617b279e24288aa398f7264ceacc7ee6c (patch) | |
| tree | f1ffa3ac6a59e23304fe0dc57d107b8194ee4b1b | |
| parent | am: convert applypatch-msg to use hook.h (diff) | |
| download | tgif-67ad630617b279e24288aa398f7264ceacc7ee6c.tar.xz | |
merge: convert post-merge to use hook.h
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>
Acked-by: Emily Shaffer <emilyshaffer@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -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 5f0476b0b7..5be3009c2a 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); |