From: Emily Shaffer <emilyshaffer@google.com>
Date: Wed, 22 Dec 2021 03:59:34 +0000 (+0100)
Subject: merge: convert post-merge to use hook.h
X-Git-Tag: v2.36.0-rc0~174^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67ad630617b279e24288aa398f7264ceacc7ee6c;p=thirdparty%2Fgit.git

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>
---

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);