From: Benoit Pierre Date: Tue, 18 Mar 2014 10:00:54 +0000 (+0100) Subject: merge: fix GIT_EDITOR override for commit hook X-Git-Tag: v1.9.2~9^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a3beb0e2e29ca7a3c33a10112424650706edb5f;p=thirdparty%2Fgit.git merge: fix GIT_EDITOR override for commit hook Don't set GIT_EDITOR to ":" when calling prepare-commit-msg hook if the editor is going to be called (e.g. with "merge -e"). Signed-off-by: Benoit Pierre Signed-off-by: Junio C Hamano --- diff --git a/builtin/merge.c b/builtin/merge.c index 67f312d877..b11a528ce5 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -821,7 +821,7 @@ static void prepare_to_commit(struct commit_list *remoteheads) if (0 < option_edit) strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char); write_merge_msg(&msg); - if (run_commit_hook(1, get_index_file(), "prepare-commit-msg", + if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg", git_path("MERGE_MSG"), "merge", NULL)) abort_commit(remoteheads, NULL); if (0 < option_edit) {