[PATCH 3/6] merge: fix GIT_EDITOR override for commit hook
- From
Benoit Pierre <benoit.pierre@gmail.com>
- Date
- Mar 6, 2014, 14:50 UTC
- Message-ID
- <1394117424-29780-4-git-send-email-benoit.pierre@gmail.com>
- In-Reply-To
- <1394117424-29780-1-git-send-email-benoit.pierre@gmail.com>
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 <benoit.pierre@gmail.com> --- builtin/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/merge.c b/builtin/merge.c index d2a1bfe..da7cafe 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) {
-- 1.9.0