summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2020-07-25 23:41:14 -0400
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-07-27 10:04:49 -0400
commitd7d31462b106f32c54d9444d2ad6ee8e05932dfe (patch)
treec113ad18ca6e2b467670f995407518cb8ff1fd87
parent8959031380f0f74177a1b5d2da360bf23d23088f (diff)
downloadb4-d7d31462b106f32c54d9444d2ad6ee8e05932dfe.tar.gz
Fix basement detection for empty commit message bodies
The get_body_parts() method added in ba6c790 (Parse body parts into usual chunks, 2020-04-27) splits the commit message body on "\n---\n" and takes the second half as the "basement" of the patch. The body is stripped of flanking new lines, though, so a delimiter beginning with a new line isn't appropriate for commit messages without a message body. Make the starting new line optional. Note that this doesn't matter in the end in terms of the final applied patch. Before 31f33fd (Fix body part parsing when '---' is not used, 2020-06-08), the expected patch output was produced despite the diff lines being processed as the message body. After that commit, the information following the triple dash is a bit off, but it doesn't matter because git discards it anyway. Signed-off-by: Kyle Meyer <kyle@kyleam.com> Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
-rw-r--r--b4/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/b4/__init__.py b/b4/__init__.py
index 5c2de31..68856dd 100644
--- a/b4/__init__.py
+++ b/b4/__init__.py
@@ -1204,7 +1204,7 @@ class LoreMessage:
signature = sparts[1]
body = sparts[0].rstrip('\n')
- parts = body.split('\n---\n', 1)
+ parts = re.split('^---\n', body, maxsplit=1, flags=re.M)
if len(parts) == 2:
basement = parts[1].rstrip('\n')
elif body.find('\ndiff ') >= 0: