diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-18 00:01:31 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-18 00:01:32 +0100 |
| commit | 795b01422da12da3e576fb3468c627b78948b3dc (patch) | |
| tree | 2dcec27ba4662ef920a034680e37f48d3f4a7e5d /sequencer.c | |
| parent | Merge branch 'sg/completion-remote' (diff) | |
| parent | sequencer: preserve commit messages (diff) | |
| download | git-795b01422da12da3e576fb3468c627b78948b3dc.tar.xz git-795b01422da12da3e576fb3468c627b78948b3dc.zip | |
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.c | 5 |
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) |