TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Fix bug in commit verification introduced in #13673 (#14040)

Browse source 
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 <art27@cantab.net>
This commit is contained in:
zeripath 2020-12-17 20:42:33 +00:00 committed by GitHub
parent 3260e15668
commit e4567d4285
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/git/commit_reader.go
View file

@ -36,6 +36,10 @@ readLoop:
line, err := bufReader.ReadBytes('\n') line, err := bufReader.ReadBytes('\n')
if err != nil { if err != nil {
if err == io.EOF { if err == io.EOF {
if message {
_, _ = messageSB.Write(line)
}
_, _ = payloadSB.Write(line)
break readLoop break readLoop
} }
return nil, err return nil, err
@ -86,10 +90,10 @@ readLoop:
} }
} else { } else {
_, _ = messageSB.Write(line) _, _ = messageSB.Write(line)
_, _ = payloadSB.Write(line)
} }
} }
commit.CommitMessage = messageSB.String() commit.CommitMessage = messageSB.String()
_, _ = payloadSB.WriteString(commit.CommitMessage)
commit.Signature = &CommitGPGSignature{ commit.Signature = &CommitGPGSignature{
Signature: signatureSB.String(), Signature: signatureSB.String(),
Payload: payloadSB.String(), Payload: payloadSB.String(),