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 <benoit.pierre@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Benoit Pierre committed
Mar 18, 2014 at 11:00 UTC
0a3beb0e2e29ca7a3c33a10112424650706edb5f
1 file changed
+1
-1
builtin/merge.c
+1
-1
@@ -821,7 +821,7 @@ static void prepare_to_commit(struct commit_list *remoteheads)
821
if (0 < option_edit)
822
strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
823
write_merge_msg(&msg);
824
- if (run_commit_hook(1, get_index_file(), "prepare-commit-msg",
824
+ if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
825
git_path("MERGE_MSG"), "merge", NULL))
826
abort_commit(remoteheads, NULL);
827
if (0 < option_edit) {