diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2018-01-24 12:34:22 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-24 11:01:31 -0800 |
| commit | 66618a50f9c9f008d7aef751418f12ba9bfc6b85 (patch) | |
| tree | 76a32ec2bf46ceec61faef339e1f7d22b473e34a /builtin | |
| parent | 15cd6d3a259c3c6d8b16ffa4793505720db45e0c (diff) | |
| download | git-pw/sequencer-in-process-commit.tar.gz | |
sequencer: run 'prepare-commit-msg' hookpw/sequencer-in-process-commit
Commit 356ee4659b ("sequencer: try to commit without forking 'git
commit'", 2017-11-24) forgot to run the 'prepare-commit-msg' hook when
creating the commit. Fix this by writing the commit message to a
different file and running the hook. Using a different file means that
if the commit is cancelled the original message file is
unchanged. Also move the checks for an empty commit so the order
matches 'git commit'.
Reported-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Helped-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 22d260197e..9f97ff8b98 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -66,8 +66,6 @@ N_("If you wish to skip this commit, use:\n" "Then \"git cherry-pick --continue\" will resume cherry-picking\n" "the remaining commits.\n"); -static GIT_PATH_FUNC(git_path_commit_editmsg, "COMMIT_EDITMSG") - static const char *use_message_buffer; static struct lock_file index_lock; /* real index */ static struct lock_file false_lock; /* used only for partial commits */ |