summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-17 16:01:31 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-17 16:01:32 -0700
commit795b01422da12da3e576fb3468c627b78948b3dc (patch)
tree2dcec27ba4662ef920a034680e37f48d3f4a7e5d /sequencer.c
parente5b8ce243cc41a859469098a0f26d7ee1b1a49bc (diff)
parent17d65f03e1d2d1678d9960a4f71e4caccacf500f (diff)
downloadgit-795b01422da12da3e576fb3468c627b78948b3dc.tar.gz
Merge branch 'mg/sequencer-commit-messages-always-verbatim'
"git cherry-pick" used to clean-up the log message even when it is merely replaying an existing commit. It now replays the message verbatim unless you are editing the message of resulting commits. * mg/sequencer-commit-messages-always-verbatim: sequencer: preserve commit messages
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c
index 32aa05ed82..c4f4b7d571 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -373,6 +373,7 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
{
struct argv_array array;
int rc;
+ const char *value;
argv_array_init(&array);
argv_array_push(&array, "commit");
@@ -385,6 +386,10 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
if (!opts->edit) {
argv_array_push(&array, "-F");
argv_array_push(&array, defmsg);
+ if (!opts->signoff &&
+ !opts->record_origin &&
+ git_config_get_value("commit.cleanup", &value))
+ argv_array_push(&array, "--cleanup=verbatim");
}
if (allow_empty)