diff options
| -rw-r--r-- | sequencer.c | 8 | ||||
| -rwxr-xr-x | t/t7504-commit-msg-hook.sh | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sequencer.c b/sequencer.c index 677e6ef764..d53ca44e5e 100644 --- a/sequencer.c +++ b/sequencer.c @@ -606,6 +606,7 @@ N_("you have staged changes in your working tree\n" #define EDIT_MSG (1<<1) #define AMEND_MSG (1<<2) #define CLEANUP_MSG (1<<3) +#define VERIFY_MSG (1<<4) /* * If we are cherry-pick, and if the merge did not result in @@ -642,8 +643,9 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts, } argv_array_push(&cmd.args, "commit"); - argv_array_push(&cmd.args, "-n"); + if (!(flags & VERIFY_MSG)) + argv_array_push(&cmd.args, "-n"); if ((flags & AMEND_MSG)) argv_array_push(&cmd.args, "--amend"); if (opts->gpg_sign) @@ -996,6 +998,8 @@ static int do_pick_commit(enum todo_command command, struct commit *commit, if (res || command != TODO_REWORD) goto leave; flags |= EDIT_MSG | AMEND_MSG; + if (command == TODO_REWORD) + flags |= VERIFY_MSG; msg_file = NULL; goto fast_forward_edit; } @@ -1050,7 +1054,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit, } if (command == TODO_REWORD) - flags |= EDIT_MSG; + flags |= EDIT_MSG | VERIFY_MSG; else if (is_fixup(command)) { if (update_squash_messages(command, commit, opts)) return -1; diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh index c3d9ab02a3..88d4cda299 100755 --- a/t/t7504-commit-msg-hook.sh +++ b/t/t7504-commit-msg-hook.sh @@ -230,7 +230,7 @@ chmod +x reword-editor REWORD_EDITOR="$(pwd)/reword-editor" export REWORD_EDITOR -test_expect_failure 'hook is called for reword during `rebase -i`' ' +test_expect_success 'hook is called for reword during `rebase -i`' ' GIT_SEQUENCE_EDITOR="\"$REWORD_EDITOR\"" git rebase -i HEAD^ && commit_msg_is "new message" |