diff options
| author |  Benoit Pierre <benoit.pierre@gmail.com> | 2014-03-18 11:00:54 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-03-18 11:25:38 -0700 |
| commit | 0a3beb0e2e29ca7a3c33a10112424650706edb5f (patch) | |
| tree | 1147468aff216f1cdff0f2ecf3ee7aad8b297449 | |
| parent | commit: fix patch hunk editing with "commit -p -m" (diff) | |
| download | tgif-0a3beb0e2e29ca7a3c33a10112424650706edb5f.tar.xz | |
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>
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |