| Message ID | 20210528042635.24959-1-kyle@kyleam.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [b4] Limit 'From mboxrd@z' replacement to start of message | expand |
On Fri, 28 May 2021 00:26:35 -0400, Kyle Meyer wrote: > save_git_am_mbox() replaces 'From mboxrd@z ' with 'From git@z ' to > make it clear that the output format is not mboxrd. However, all > occurrences in the message are replaced, corrupting patches that > contain 'From mboxrd@z '. Restrict the replacement to the first line > of the message. Applied, thanks! [1/1] Limit 'From mboxrd@z' replacement to start of message commit: 74c8e095354e5401a4fc02259f7871c40392b690 Best regards,
diff --git a/b4/__init__.py b/b4/__init__.py index 2b35a42..17c569d 100644 --- a/b4/__init__.py +++ b/b4/__init__.py @@ -2275,7 +2275,7 @@ def save_git_am_mbox(msgs: list, dest): bmsg = msg.as_bytes(unixfrom=True, policy=emlpolicy) # public-inbox unixfrom says "mboxrd", so replace it with something else # so there is no confusion as it's NOT mboxrd - bmsg = bmsg.replace(b'From mboxrd@z ', b'From git@z ') + bmsg = re.sub(b'^From mboxrd@z ', b'From git@z ', bmsg) bmsg = bmsg.rstrip(b'\r\n') + b'\n\n' dest.write(bmsg)
save_git_am_mbox() replaces 'From mboxrd@z ' with 'From git@z ' to make it clear that the output format is not mboxrd. However, all occurrences in the message are replaced, corrupting patches that contain 'From mboxrd@z '. Restrict the replacement to the first line of the message. Signed-off-by: Kyle Meyer <kyle@kyleam.com> --- b4/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: ee5e56d06c786d7906c214fc1f8cbbeeb3e658a6