Hook "post-merge" does not get executed in case of confilicts

From: Bertram Scharpf <lists@bertram-scharpf.de>
Date: Aug 21, 2014, 18:51 UTC
Message-ID: <20140821185141.GA93319@becker.bs.l>

Hi,

today I wrote a port-merge hook. Then I just detected that it only gets executed when the merge is immediately successful. In case there is a conflict, I have to finish the merge using the command "git commit". This will not call the post-merge hook.

I think the hook should be reliable to be executed on _every_ non-failed merge. Therefore I propose the below extension.

Bertram

diff --git a/builtin/commit.c b/builtin/commit.c
index 5ed6036..6a8ee2d 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1783,6 +1783,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 
 	rerere(0);
 	run_commit_hook(use_editor, get_index_file(), "post-commit", NULL);
+	if (whence == FROM_MERGE)
+		run_hook_le(NULL, "post-merge", "0", NULL);
 	if (amend && !no_post_rewrite) {
 		struct notes_rewrite_cfg *cfg;
 		cfg = init_copy_notes_for_rewrite("amend");

-- 
Bertram Scharpf
Stuttgart, Deutschland/Germany
http://www.bertram-scharpf.de