| commit | 17d65f03e1d2d1678d9960a4f71e4caccacf500f | |
| author | Michael J Gruber <git@drmicha.warpmail.net> | |
| Fri, 6 Mar 2015 13:55:32 +0000 (6 14:55 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Mar 2015 19:11:39 +0000 (6 11:11 -0800) | ||
| tree | f982ab3cf69fccbbc2f6b8686543c5ee2fdd19aa | treesnapshot (tar.gz zip) |
| parent | 282616c72d1d08a77ca4fe1186cb708c38408d87 | commitdiff |
sequencer: preserve commit messages
sequencer calls "commit" with default options, which implies
"--cleanup=default" unless the user specified something else in their
config. This leads to cherry-picked commits getting a cleaned up commit
message, which is usually not an intended side-effect.
Make the sequencer use "--cleanup=verbatim" so that it preserves commit
messages independent of the default, unless the user has set config for "commit"
or the message is amended with -s or -x.
Reported-by: Christoph Anton Mitterer <calestyo@scientia.net>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer calls "commit" with default options, which implies
"--cleanup=default" unless the user specified something else in their
config. This leads to cherry-picked commits getting a cleaned up commit
message, which is usually not an intended side-effect.
Make the sequencer use "--cleanup=verbatim" so that it preserves commit
messages independent of the default, unless the user has set config for "commit"
or the message is amended with -s or -x.
Reported-by: Christoph Anton Mitterer <calestyo@scientia.net>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| sequencer.c | diffblobblamehistory | |
| t/t3511-cherry-pick-x.sh | diffblobblamehistory |