From: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> The new test and the test hook scripts has been updated with some style fixes spotted by Junio. I've added an extra commit at the beginning to update the style of the original hook, so my later changes are clearer. Original cover letter: These two patches add some tests and fix the sequencer to run the 'prepare-commit-msg' hook when committing without forking 'git commit' Phillip Wood (3): t7505: style fixes t7505: Add tests for cherry-pick and rebase -i/-p sequencer: run 'prepare-commit-msg' hook builtin/commit.c | 2 - sequencer.c | 69 +++++++++++++++---- sequencer.h | 1 + t/t7505-prepare-commit-msg-hook.sh | 134 +++++++++++++++++++++++++++++++++++-- t/t7505/expected-rebase-i | 17 +++++ t/t7505/expected-rebase-p | 18 +++++ 6 files changed, 219 insertions(+), 22 deletions(-) create mode 100644 t/t7505/expected-rebase-i create mode 100644 t/t7505/expected-rebase-p -- 2.15.1