From 1d90219df9694c214aae62e97afbec13dbc04bfb Mon Sep 17 00:00:00 2001
From: Bruno Gouveia <bgouvei@amazon.co.uk>
Date: Thu, 8 Apr 2021 18:22:08 +0100
Subject: [PATCH] Fix CommitMessage combine wrongly concatenating subject to
 body

---
 asyncgit/src/sync/commit_details.rs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/asyncgit/src/sync/commit_details.rs b/asyncgit/src/sync/commit_details.rs
index 28a851db..f9620005 100644
--- a/asyncgit/src/sync/commit_details.rs
+++ b/asyncgit/src/sync/commit_details.rs
@@ -60,7 +60,7 @@ impl CommitMessage {
     ///
     pub fn combine(self) -> String {
         if let Some(body) = self.body {
-            format!("{}{}", self.subject, body)
+            format!("{}\n{}", self.subject, body)
         } else {
             self.subject
         }
@@ -158,4 +158,13 @@ mod tests {
 
         Ok(())
     }
+
+    #[test]
+    fn test_commit_message_combine() -> Result<()> {
+        let msg = CommitMessage::from("foo\nbar\r\ntest");
+
+        assert_eq!(msg.combine(), String::from("foo\nbar\ntest"));
+
+        Ok(())
+    }
 }