merge: convert post-merge to use hook.h

nasamuffin · gitster · commit 67ad630617b2 · 2022-01-07T15:19:34.000-08:00
Teach post-merge to use the hook.h library instead of the
run-command.h library to run hooks.

Signed-off-by: Emily Shaffer &lt;emilyshaffer@google.com&gt;
Signed-off-by: Ævar Arnfjörð Bjarmason &lt;avarab@gmail.com&gt;
Acked-by: Emily Shaffer &lt;emilyshaffer@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ static void finish(struct commit *head_commit,`
`487`	`487`	`}`
`488`	`488`
`489`	`489`	`/* Run a post-merge hook */`
`490`		`- run_hook_le(NULL, "post-merge", squash ? "1" : "0", NULL);`
	`490`	`+ run_hooks_l("post-merge", squash ? "1" : "0", NULL);`
`491`	`491`
`492`	`492`	`apply_autostash(git_path_merge_autostash(the_repository));`
`493`	`493`	`strbuf_release(&reflog_message);`