diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2020-07-25 23:41:15 -0400 |
|---|---|---|
| committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2020-07-27 10:06:15 -0400 |
| commit | ec4be938f95c65c6553f8f091f33d92dea5bb229 (patch) | |
| tree | baa64f0cdf5f940dbcebb75872eaf67d816e8760 | |
| parent | b216f8311a3e4eb4bf637ec11f40fdd0c65585a0 (diff) | |
| download | b4-ec4be938f95c65c6553f8f091f33d92dea5bb229.tar.gz | |
Fix handling of single-paragraph commit message bodies
The get_body_parts() method added in ba6c790 (Parse body parts into
usual chunks, 2020-04-27) strips lines that look like trailers from
the last paragraph, storing the other lines to add back to the
message. However, if the commit message has only a single paragraph,
get_body_parts() returns early, unconditionally returning an empty
string for the message even if non-trailer lines were encountered.
Return the collected non-trailer lines, if any, as the message.
Signed-off-by: Kyle Meyer <kyle@kyleam.com>
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
| -rw-r--r-- | b4/__init__.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/b4/__init__.py b/b4/__init__.py index 7e3134f..b7b33f4 100644 --- a/b4/__init__.py +++ b/b4/__init__.py @@ -1241,6 +1241,8 @@ class LoreMessage: if githeaders == trailers: # This is a message that consists of just trailers? githeaders = list() + if nlines: + message = '\n'.join(nlines) return githeaders, message, trailers, basement, signature # Add all parts between first and last to mparts |