kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Emily Shaffer 2021-12-22 04:59:34 +01:00 committed by Junio C Hamano
parent 432a50bebf
commit 67ad630617
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/merge.c
View File

@ -487,7 +487,7 @@ static void finish(struct commit *head_commit,
} }


/* Run a post-merge hook */ /* 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)); apply_autostash(git_path_merge_autostash(the_repository));
strbuf_release(&reflog_message); strbuf_release(&reflog_message);