Skip to content

Commit

Permalink
Merge pull request #987 from Jerry-yz/master
Browse files Browse the repository at this point in the history
object: fix variable  defaultUtf8CommitMessageEncoding name spell error
  • Loading branch information
pjbgf committed Jan 16, 2024
2 parents 5159838 + 90498b3 commit 427a6ea
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions plumbing/object/commit.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const (
// the commit with the "mergetag" header.
headermergetag string = "mergetag"

defaultUtf8CommitMesageEncoding MessageEncoding = "UTF-8"
defaultUtf8CommitMessageEncoding MessageEncoding = "UTF-8"
)

// Hash represents the hash of an object
Expand Down Expand Up @@ -189,7 +189,7 @@ func (c *Commit) Decode(o plumbing.EncodedObject) (err error) {
}

c.Hash = o.Hash()
c.Encoding = defaultUtf8CommitMesageEncoding
c.Encoding = defaultUtf8CommitMessageEncoding

reader, err := o.Reader()
if err != nil {
Expand Down Expand Up @@ -335,7 +335,7 @@ func (c *Commit) encode(o plumbing.EncodedObject, includeSig bool) (err error) {
}
}

if string(c.Encoding) != "" && c.Encoding != defaultUtf8CommitMesageEncoding {
if string(c.Encoding) != "" && c.Encoding != defaultUtf8CommitMessageEncoding {
if _, err = fmt.Fprintf(w, "\n%s %s", headerencoding, c.Encoding); err != nil {
return err
}
Expand Down
6 changes: 3 additions & 3 deletions plumbing/object/commit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ change
Message: "Message\n\nFoo\nBar\nWith trailing blank lines\n\n",
TreeHash: plumbing.NewHash("f000000000000000000000000000000000000001"),
ParentHashes: []plumbing.Hash{plumbing.NewHash("f000000000000000000000000000000000000002")},
Encoding: defaultUtf8CommitMesageEncoding,
Encoding: defaultUtf8CommitMessageEncoding,
},
{
Author: Signature{Name: "Foo", Email: "foo@example.local", When: ts},
Expand All @@ -253,7 +253,7 @@ change
plumbing.NewHash("f000000000000000000000000000000000000003"),
},
MergeTag: tag,
Encoding: defaultUtf8CommitMesageEncoding,
Encoding: defaultUtf8CommitMessageEncoding,
},
{
Author: Signature{Name: "Foo", Email: "foo@example.local", When: ts},
Expand All @@ -266,7 +266,7 @@ change
},
MergeTag: tag,
PGPSignature: pgpsignature,
Encoding: defaultUtf8CommitMesageEncoding,
Encoding: defaultUtf8CommitMessageEncoding,
},
}
for _, commit := range commits {
Expand Down

0 comments on commit 427a6ea

Please sign in to comment.