From e4567d428575405eda834bb49330e2e8b300642b Mon Sep 17 00:00:00 2001 From: zeripath Date: Thu, 17 Dec 2020 20:42:33 +0000 Subject: [PATCH] Fix bug in commit verification introduced in #13673 (#14040) There is a slight bug in the commit_reader introduced in #13673 whereby commit messages which have a final unterminated line miss their final line. This PR fixes this. Signed-off-by: Andrew Thornton --- modules/git/commit_reader.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/git/commit_reader.go b/modules/git/commit_reader.go index 4eb861040..a4d15b6ba 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(),