Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

plumbing: Use ReadBytes() rather than ReadSlice() #314

Merged
merged 1 commit into from
Mar 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plumbing/object/commit.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func (c *Commit) Decode(o plumbing.EncodedObject) (err error) {

var message bool
for {
line, err := r.ReadSlice('\n')
line, err := r.ReadBytes('\n')
if err != nil && err != io.EOF {
return err
}
Expand Down
17 changes: 17 additions & 0 deletions plumbing/object/commit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package object

import (
"io"
"strings"
"time"

"github.com/src-d/go-git-fixtures"
Expand Down Expand Up @@ -167,3 +168,19 @@ func (s *SuiteCommit) TestCommitIterNext(c *C) {
c.Assert(err, Equals, io.EOF)
c.Assert(commit, IsNil)
}

func (s *SuiteCommit) TestLongCommitMessageSerialization(c *C) {
encoded := &plumbing.MemoryObject{}
decoded := &Commit{}
commit := *s.Commit

longMessage := "my message: message\n\n" + strings.Repeat("test", 4096) + "\nOK"
commit.Message = longMessage

err := commit.Encode(encoded)
c.Assert(err, IsNil)

err = decoded.Decode(encoded)
c.Assert(err, IsNil)
c.Assert(decoded.Message, Equals, longMessage)
}
2 changes: 1 addition & 1 deletion plumbing/object/tag.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (t *Tag) Decode(o plumbing.EncodedObject) (err error) {

r := bufio.NewReader(reader)
for {
line, err := r.ReadSlice('\n')
line, err := r.ReadBytes('\n')
if err != nil && err != io.EOF {
return err
}
Expand Down
17 changes: 17 additions & 0 deletions plumbing/object/tag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package object
import (
"fmt"
"io"
"strings"
"time"

"github.com/src-d/go-git-fixtures"
Expand Down Expand Up @@ -269,3 +270,19 @@ func (s *TagSuite) TestTagToTagString(c *C) {
"\n"+
"\n")
}

func (s *TagSuite) TestLongTagNameSerialization(c *C) {
encoded := &plumbing.MemoryObject{}
decoded := &Tag{}
tag := s.tag(c, plumbing.NewHash("b742a2a9fa0afcfa9a6fad080980fbc26b007c69"))

longName := "my tag: name " + strings.Repeat("test", 4096) + " OK"
tag.Name = longName

err := tag.Encode(encoded)
c.Assert(err, IsNil)

err = decoded.Decode(encoded)
c.Assert(err, IsNil)
c.Assert(decoded.Name, Equals, longName)
}