summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2018-08-23 00:50:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-08-23 17:08:51 (GMT)
commitffce7f590fabee6f2314ffd891f1fd3629222839 (patch)
tree861728a925660f13245dab61bcd8a4ac33259f62 /Documentation
parente5fba5d55886eaf48aeeb158dd4d30c2fc0294c9 (diff)
downloadgit-ffce7f590fabee6f2314ffd891f1fd3629222839.zip
git-ffce7f590fabee6f2314ffd891f1fd3629222839.tar.gz
git-ffce7f590fabee6f2314ffd891f1fd3629222839.tar.bz2
sequencer: ignore "---" divider when parsing trailers
When the sequencer code appends a signoff or cherry-pick origin, it uses the default trailer-parsing options, which treat "---" as the end of the commit message. As a result, it may be fooled by a commit message that contains that string and fail to find the existing trailer block. Even more confusing, the actual append code does not know about "---", and always appends to the end of the string. This can lead to bizarre results. E.g., appending a signoff to a commit message like this: subject body --- these dashes confuse the parser! Signed-off-by: A results in output with a final block like: Signed-off-by: A Signed-off-by: A The parser thinks the final line of the message is "body", and ignores everything else, claiming there are no trailers. So we output an extra newline separator (wrong) and add a duplicate signoff (also wrong). Since we know we are feeding a pure commit message, we can simply tell the parser to ignore the "---" divider. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions