Merge branch 'sb/submodule-parallel-fetch' into maint

diff --git a/sequencer.c b/sequencer.c
index c6362d63f35fe37d67fa235784ab8ce75a60db44..a33c39b64fbd9cf42e5bd531488f7d2366bd167b 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -544,10 +544,8 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
                 * information followed by "\n\n".
                 */
                p = strstr(msg.message, "\n\n");
-               if (p) {
-                       p += 2;
-                       strbuf_addstr(&msgbuf, p);
-               }
+               if (p)
+                       strbuf_addstr(&msgbuf, skip_blank_lines(p + 2));
 
                if (opts->record_origin) {
                        if (!has_conforming_footer(&msgbuf, NULL, 0))