diff --git a/modules/git/commit_reader.go b/modules/git/commit_reader.go
index 4eb861040e..a4d15b6bad 100644
--- a/modules/git/commit_reader.go
+++ b/modules/git/commit_reader.go
@@ -36,6 +36,10 @@ readLoop:
 		line, err := bufReader.ReadBytes('\n')
 		if err != nil {
 			if err == io.EOF {
+				if message {
+					_, _ = messageSB.Write(line)
+				}
+				_, _ = payloadSB.Write(line)
 				break readLoop
 			}
 			return nil, err
@@ -86,10 +90,10 @@ readLoop:
 			}
 		} else {
 			_, _ = messageSB.Write(line)
+			_, _ = payloadSB.Write(line)
 		}
 	}
 	commit.CommitMessage = messageSB.String()
-	_, _ = payloadSB.WriteString(commit.CommitMessage)
 	commit.Signature = &CommitGPGSignature{
 		Signature: signatureSB.String(),
 		Payload:   payloadSB.String(),