*: fix some typos

Signed-off-by: Zhizhen He <hezhizhen.yi@gmail.com>

16 files changed, 267 insertions, 267 deletions

diff --git a/_examples/sha256/main.go b/_examples/sha256/main.go
index e1772d2..0392772 100644
--- a/_examples/sha256/main.go
+++ b/_examples/sha256/main.go
@@ -15,7 +15,7 @@ import (
 // This example requires building with the sha256 tag for it to work:
 // go run -tags sha256 main.go /tmp/repository
 
-// Basic example of how to initialise a repository using sha256 as the hashing algorithmn.
+// Basic example of how to initialise a repository using sha256 as the hashing algorithm.
 func main() {
 	CheckArgs("<directory>")
 	directory := os.Args[1]
diff --git a/config/config.go b/config/config.go
index 82af12d..da425a7 100644
--- a/config/config.go
+++ b/config/config.go
@@ -63,9 +63,9 @@ type Config struct {
 	}
 
 	User struct {
-		// Name is the personal name of the author and the commiter of a commit.
+		// Name is the personal name of the author and the committer of a commit.
 		Name string
-		// Email is the email of the author and the commiter of a commit.
+		// Email is the email of the author and the committer of a commit.
 		Email string
 	}
 
@@ -77,9 +77,9 @@ type Config struct {
 	}
 
 	Committer struct {
-		// Name is the personal name of the commiter of a commit.
+		// Name is the personal name of the committer of a commit.
 		Name string
-		// Email is the email of the  the commiter of a commit.
+		// Email is the email of the committer of a commit.
 		Email string
 	}
 
@@ -157,8 +157,8 @@ func ReadConfig(r io.Reader) (*Config, error) {
 }
 
 // LoadConfig loads a config file from a given scope. The returned Config,
-// contains exclusively information fom the given scope. If couldn't find a
-// config file to the given scope, a empty one is returned.
+// contains exclusively information from the given scope. If it couldn't find a
+// config file to the given scope, an empty one is returned.
 func LoadConfig(scope Scope) (*Config, error) {
 	if scope == LocalScope {
 		return nil, fmt.Errorf("LocalScope should be read from the a ConfigStorer")
diff --git a/plumbing/filemode/filemode.go b/plumbing/filemode/filemode.go
index b848a97..ea1a457 100644
--- a/plumbing/filemode/filemode.go
+++ b/plumbing/filemode/filemode.go
@@ -133,7 +133,7 @@ func (m FileMode) IsMalformed() bool {
 		m != Submodule
 }
 
-// String returns the FileMode as a string in the standatd git format,
+// String returns the FileMode as a string in the standard git format,
 // this is, an octal number padded with ceros to 7 digits.  Malformed
 // modes are printed in that same format, for easier debugging.
 //
diff --git a/plumbing/hash/hash.go b/plumbing/hash/hash.go
index 82d1856..8609848 100644
--- a/plumbing/hash/hash.go
+++ b/plumbing/hash/hash.go
@@ -24,7 +24,7 @@ func reset() {
 	algos[crypto.SHA256] = crypto.SHA256.New
 }
 
-// RegisterHash allows for the hash algorithm used to be overriden.
+// RegisterHash allows for the hash algorithm used to be overridden.
 // This ensures the hash selection for go-git must be explicit, when
 // overriding the default value.
 func RegisterHash(h crypto.Hash, f func() hash.Hash) error {
diff --git a/plumbing/object.go b/plumbing/object.go
index 2655dee..3ee9de9 100644
--- a/plumbing/object.go
+++ b/plumbing/object.go
@@ -82,7 +82,7 @@ func (t ObjectType) Valid() bool {
 	return t >= CommitObject && t <= REFDeltaObject
 }
 
-// IsDelta returns true for any ObjectTyoe that represents a delta (i.e.
+// IsDelta returns true for any ObjectType that represents a delta (i.e.
 // REFDeltaObject or OFSDeltaObject).
 func (t ObjectType) IsDelta() bool {
 	return t == REFDeltaObject || t == OFSDeltaObject
diff --git a/plumbing/object/commitgraph/commitnode.go b/plumbing/object/commitgraph/commitnode.go
index 7abc58b..d92c906 100644
--- a/plumbing/object/commitgraph/commitnode.go
+++ b/plumbing/object/commitgraph/commitnode.go
@@ -1,98 +1,98 @@
-package commitgraph

-

-import (

-	"io"

-	"time"

-

-	"github.com/go-git/go-git/v5/plumbing"

-	"github.com/go-git/go-git/v5/plumbing/object"

-	"github.com/go-git/go-git/v5/plumbing/storer"

-)

-

-// CommitNode is generic interface encapsulating a lightweight commit object retrieved

-// from CommitNodeIndex

-type CommitNode interface {

-	// ID returns the Commit object id referenced by the commit graph node.

-	ID() plumbing.Hash

-	// Tree returns the Tree referenced by the commit graph node.

-	Tree() (*object.Tree, error)

-	// CommitTime returns the Commiter.When time of the Commit referenced by the commit graph node.

-	CommitTime() time.Time

-	// NumParents returns the number of parents in a commit.

-	NumParents() int

-	// ParentNodes return a CommitNodeIter for parents of specified node.

-	ParentNodes() CommitNodeIter

-	// ParentNode returns the ith parent of a commit.

-	ParentNode(i int) (CommitNode, error)

-	// ParentHashes returns hashes of the parent commits for a specified node

-	ParentHashes() []plumbing.Hash

-	// Generation returns the generation of the commit for reachability analysis.

-	// Objects with newer generation are not reachable from objects of older generation.

-	Generation() uint64

-	// Commit returns the full commit object from the node

-	Commit() (*object.Commit, error)

-}

-

-// CommitNodeIndex is generic interface encapsulating an index of CommitNode objects

-type CommitNodeIndex interface {

-	// Get returns a commit node from a commit hash

-	Get(hash plumbing.Hash) (CommitNode, error)

-}

-

-// CommitNodeIter is a generic closable interface for iterating over commit nodes.

-type CommitNodeIter interface {

-	Next() (CommitNode, error)

-	ForEach(func(CommitNode) error) error

-	Close()

-}

-

-// parentCommitNodeIter provides an iterator for parent commits from associated CommitNodeIndex.

-type parentCommitNodeIter struct {

-	node CommitNode

-	i    int

-}

-

-func newParentgraphCommitNodeIter(node CommitNode) CommitNodeIter {

-	return &parentCommitNodeIter{node, 0}

-}

-

-// Next moves the iterator to the next commit and returns a pointer to it. If

-// there are no more commits, it returns io.EOF.

-func (iter *parentCommitNodeIter) Next() (CommitNode, error) {

-	obj, err := iter.node.ParentNode(iter.i)

-	if err == object.ErrParentNotFound {

-		return nil, io.EOF

-	}

-	if err == nil {

-		iter.i++

-	}

-

-	return obj, err

-}

-

-// ForEach call the cb function for each commit contained on this iter until

-// an error appends or the end of the iter is reached. If ErrStop is sent

-// the iteration is stopped but no error is returned. The iterator is closed.

-func (iter *parentCommitNodeIter) ForEach(cb func(CommitNode) error) error {

-	for {

-		obj, err := iter.Next()

-		if err != nil {

-			if err == io.EOF {

-				return nil

-			}

-

-			return err

-		}

-

-		if err := cb(obj); err != nil {

-			if err == storer.ErrStop {

-				return nil

-			}

-

-			return err

-		}

-	}

-}

-

-func (iter *parentCommitNodeIter) Close() {

-}

+package commitgraph
+
+import (
+	"io"
+	"time"
+
+	"github.com/go-git/go-git/v5/plumbing"
+	"github.com/go-git/go-git/v5/plumbing/object"
+	"github.com/go-git/go-git/v5/plumbing/storer"
+)
+
+// CommitNode is generic interface encapsulating a lightweight commit object retrieved
+// from CommitNodeIndex
+type CommitNode interface {
+	// ID returns the Commit object id referenced by the commit graph node.
+	ID() plumbing.Hash
+	// Tree returns the Tree referenced by the commit graph node.
+	Tree() (*object.Tree, error)
+	// CommitTime returns the Committer.When time of the Commit referenced by the commit graph node.
+	CommitTime() time.Time
+	// NumParents returns the number of parents in a commit.
+	NumParents() int
+	// ParentNodes return a CommitNodeIter for parents of specified node.
+	ParentNodes() CommitNodeIter
+	// ParentNode returns the ith parent of a commit.
+	ParentNode(i int) (CommitNode, error)
+	// ParentHashes returns hashes of the parent commits for a specified node
+	ParentHashes() []plumbing.Hash
+	// Generation returns the generation of the commit for reachability analysis.
+	// Objects with newer generation are not reachable from objects of older generation.
+	Generation() uint64
+	// Commit returns the full commit object from the node
+	Commit() (*object.Commit, error)
+}
+
+// CommitNodeIndex is generic interface encapsulating an index of CommitNode objects
+type CommitNodeIndex interface {
+	// Get returns a commit node from a commit hash
+	Get(hash plumbing.Hash) (CommitNode, error)
+}
+
+// CommitNodeIter is a generic closable interface for iterating over commit nodes.
+type CommitNodeIter interface {
+	Next() (CommitNode, error)
+	ForEach(func(CommitNode) error) error
+	Close()
+}
+
+// parentCommitNodeIter provides an iterator for parent commits from associated CommitNodeIndex.
+type parentCommitNodeIter struct {
+	node CommitNode
+	i    int
+}
+
+func newParentgraphCommitNodeIter(node CommitNode) CommitNodeIter {
+	return &parentCommitNodeIter{node, 0}
+}
+
+// Next moves the iterator to the next commit and returns a pointer to it. If
+// there are no more commits, it returns io.EOF.
+func (iter *parentCommitNodeIter) Next() (CommitNode, error) {
+	obj, err := iter.node.ParentNode(iter.i)
+	if err == object.ErrParentNotFound {
+		return nil, io.EOF
+	}
+	if err == nil {
+		iter.i++
+	}
+
+	return obj, err
+}
+
+// ForEach call the cb function for each commit contained on this iter until
+// an error appends or the end of the iter is reached. If ErrStop is sent
+// the iteration is stopped but no error is returned. The iterator is closed.
+func (iter *parentCommitNodeIter) ForEach(cb func(CommitNode) error) error {
+	for {
+		obj, err := iter.Next()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+
+			return err
+		}
+
+		if err := cb(obj); err != nil {
+			if err == storer.ErrStop {
+				return nil
+			}
+
+			return err
+		}
+	}
+}
+
+func (iter *parentCommitNodeIter) Close() {
+}
diff --git a/plumbing/object/commitgraph/commitnode_test.go b/plumbing/object/commitgraph/commitnode_test.go
index 6c9a643..91fb211 100644
--- a/plumbing/object/commitgraph/commitnode_test.go
+++ b/plumbing/object/commitgraph/commitnode_test.go
@@ -1,148 +1,148 @@
-package commitgraph

-

-import (

-	"path"

-	"testing"

-

-	"github.com/go-git/go-git/v5/plumbing"

-	"github.com/go-git/go-git/v5/plumbing/cache"

-	"github.com/go-git/go-git/v5/plumbing/format/commitgraph"

-	"github.com/go-git/go-git/v5/plumbing/format/packfile"

-	"github.com/go-git/go-git/v5/storage/filesystem"

-

-	fixtures "github.com/go-git/go-git-fixtures/v4"

-	. "gopkg.in/check.v1"

-)

-

-func Test(t *testing.T) { TestingT(t) }

-

-type CommitNodeSuite struct {

-	fixtures.Suite

-}

-

-var _ = Suite(&CommitNodeSuite{})

-

-func unpackRepositry(f *fixtures.Fixture) *filesystem.Storage {

-	storer := filesystem.NewStorage(f.DotGit(), cache.NewObjectLRUDefault())

-	p := f.Packfile()

-	defer p.Close()

-	packfile.UpdateObjectStorage(storer, p)

-	return storer

-}

-

-func testWalker(c *C, nodeIndex CommitNodeIndex) {

-	head, err := nodeIndex.Get(plumbing.NewHash("b9d69064b190e7aedccf84731ca1d917871f8a1c"))

-	c.Assert(err, IsNil)

-

-	iter := NewCommitNodeIterCTime(

-		head,

-		nil,

-		nil,

-	)

-

-	var commits []CommitNode

-	iter.ForEach(func(c CommitNode) error {

-		commits = append(commits, c)

-		return nil

-	})

-

-	c.Assert(commits, HasLen, 9)

-

-	expected := []string{

-		"b9d69064b190e7aedccf84731ca1d917871f8a1c",

-		"6f6c5d2be7852c782be1dd13e36496dd7ad39560",

-		"a45273fe2d63300e1962a9e26a6b15c276cd7082",

-		"c0edf780dd0da6a65a7a49a86032fcf8a0c2d467",

-		"bb13916df33ed23004c3ce9ed3b8487528e655c1",

-		"03d2c021ff68954cf3ef0a36825e194a4b98f981",

-		"ce275064ad67d51e99f026084e20827901a8361c",

-		"e713b52d7e13807e87a002e812041f248db3f643",

-		"347c91919944a68e9413581a1bc15519550a3afe",

-	}

-	for i, commit := range commits {

-		c.Assert(commit.ID().String(), Equals, expected[i])

-	}

-}

-

-func testParents(c *C, nodeIndex CommitNodeIndex) {

-	merge3, err := nodeIndex.Get(plumbing.NewHash("6f6c5d2be7852c782be1dd13e36496dd7ad39560"))

-	c.Assert(err, IsNil)

-

-	var parents []CommitNode

-	merge3.ParentNodes().ForEach(func(c CommitNode) error {

-		parents = append(parents, c)

-		return nil

-	})

-

-	c.Assert(parents, HasLen, 3)

-

-	expected := []string{

-		"ce275064ad67d51e99f026084e20827901a8361c",

-		"bb13916df33ed23004c3ce9ed3b8487528e655c1",

-		"a45273fe2d63300e1962a9e26a6b15c276cd7082",

-	}

-	for i, parent := range parents {

-		c.Assert(parent.ID().String(), Equals, expected[i])

-	}

-}

-

-func testCommitAndTree(c *C, nodeIndex CommitNodeIndex) {

-	merge3node, err := nodeIndex.Get(plumbing.NewHash("6f6c5d2be7852c782be1dd13e36496dd7ad39560"))

-	c.Assert(err, IsNil)

-	merge3commit, err := merge3node.Commit()

-	c.Assert(err, IsNil)

-	c.Assert(merge3node.ID().String(), Equals, merge3commit.ID().String())

-	tree, err := merge3node.Tree()

-	c.Assert(err, IsNil)

-	c.Assert(tree.ID().String(), Equals, merge3commit.TreeHash.String())

-}

-

-func (s *CommitNodeSuite) TestObjectGraph(c *C) {

-	f := fixtures.ByTag("commit-graph").One()

-	storer := unpackRepositry(f)

-

-	nodeIndex := NewObjectCommitNodeIndex(storer)

-	testWalker(c, nodeIndex)

-	testParents(c, nodeIndex)

-	testCommitAndTree(c, nodeIndex)

-}

-

-func (s *CommitNodeSuite) TestCommitGraph(c *C) {

-	f := fixtures.ByTag("commit-graph").One()

-	storer := unpackRepositry(f)

-	reader, err := storer.Filesystem().Open(path.Join("objects", "info", "commit-graph"))

-	c.Assert(err, IsNil)

-	defer reader.Close()

-	index, err := commitgraph.OpenFileIndex(reader)

-	c.Assert(err, IsNil)

-

-	nodeIndex := NewGraphCommitNodeIndex(index, storer)

-	testWalker(c, nodeIndex)

-	testParents(c, nodeIndex)

-	testCommitAndTree(c, nodeIndex)

-}

-

-func (s *CommitNodeSuite) TestMixedGraph(c *C) {

-	f := fixtures.ByTag("commit-graph").One()

-	storer := unpackRepositry(f)

-

-	// Take the commit-graph file and copy it to memory index without the last commit

-	reader, err := storer.Filesystem().Open(path.Join("objects", "info", "commit-graph"))

-	c.Assert(err, IsNil)

-	defer reader.Close()

-	fileIndex, err := commitgraph.OpenFileIndex(reader)

-	c.Assert(err, IsNil)

-	memoryIndex := commitgraph.NewMemoryIndex()

-	for i, hash := range fileIndex.Hashes() {

-		if hash.String() != "b9d69064b190e7aedccf84731ca1d917871f8a1c" {

-			node, err := fileIndex.GetCommitDataByIndex(i)

-			c.Assert(err, IsNil)

-			memoryIndex.Add(hash, node)

-		}

-	}

-

-	nodeIndex := NewGraphCommitNodeIndex(memoryIndex, storer)

-	testWalker(c, nodeIndex)

-	testParents(c, nodeIndex)

-	testCommitAndTree(c, nodeIndex)

-}

+package commitgraph
+
+import (
+	"path"
+	"testing"
+
+	"github.com/go-git/go-git/v5/plumbing"
+	"github.com/go-git/go-git/v5/plumbing/cache"
+	"github.com/go-git/go-git/v5/plumbing/format/commitgraph"
+	"github.com/go-git/go-git/v5/plumbing/format/packfile"
+	"github.com/go-git/go-git/v5/storage/filesystem"
+
+	fixtures "github.com/go-git/go-git-fixtures/v4"
+	. "gopkg.in/check.v1"
+)
+
+func Test(t *testing.T) { TestingT(t) }
+
+type CommitNodeSuite struct {
+	fixtures.Suite
+}
+
+var _ = Suite(&CommitNodeSuite{})
+
+func unpackRepository(f *fixtures.Fixture) *filesystem.Storage {
+	storer := filesystem.NewStorage(f.DotGit(), cache.NewObjectLRUDefault())
+	p := f.Packfile()
+	defer p.Close()
+	packfile.UpdateObjectStorage(storer, p)
+	return storer
+}
+
+func testWalker(c *C, nodeIndex CommitNodeIndex) {
+	head, err := nodeIndex.Get(plumbing.NewHash("b9d69064b190e7aedccf84731ca1d917871f8a1c"))
+	c.Assert(err, IsNil)
+
+	iter := NewCommitNodeIterCTime(
+		head,
+		nil,
+		nil,
+	)
+
+	var commits []CommitNode
+	iter.ForEach(func(c CommitNode) error {
+		commits = append(commits, c)
+		return nil
+	})
+
+	c.Assert(commits, HasLen, 9)
+
+	expected := []string{
+		"b9d69064b190e7aedccf84731ca1d917871f8a1c",
+		"6f6c5d2be7852c782be1dd13e36496dd7ad39560",
+		"a45273fe2d63300e1962a9e26a6b15c276cd7082",
+		"c0edf780dd0da6a65a7a49a86032fcf8a0c2d467",
+		"bb13916df33ed23004c3ce9ed3b8487528e655c1",
+		"03d2c021ff68954cf3ef0a36825e194a4b98f981",
+		"ce275064ad67d51e99f026084e20827901a8361c",
+		"e713b52d7e13807e87a002e812041f248db3f643",
+		"347c91919944a68e9413581a1bc15519550a3afe",
+	}
+	for i, commit := range commits {
+		c.Assert(commit.ID().String(), Equals, expected[i])
+	}
+}
+
+func testParents(c *C, nodeIndex CommitNodeIndex) {
+	merge3, err := nodeIndex.Get(plumbing.NewHash("6f6c5d2be7852c782be1dd13e36496dd7ad39560"))
+	c.Assert(err, IsNil)
+
+	var parents []CommitNode
+	merge3.ParentNodes().ForEach(func(c CommitNode) error {
+		parents = append(parents, c)
+		return nil
+	})
+
+	c.Assert(parents, HasLen, 3)
+
+	expected := []string{
+		"ce275064ad67d51e99f026084e20827901a8361c",
+		"bb13916df33ed23004c3ce9ed3b8487528e655c1",
+		"a45273fe2d63300e1962a9e26a6b15c276cd7082",
+	}
+	for i, parent := range parents {
+		c.Assert(parent.ID().String(), Equals, expected[i])
+	}
+}
+
+func testCommitAndTree(c *C, nodeIndex CommitNodeIndex) {
+	merge3node, err := nodeIndex.Get(plumbing.NewHash("6f6c5d2be7852c782be1dd13e36496dd7ad39560"))
+	c.Assert(err, IsNil)
+	merge3commit, err := merge3node.Commit()
+	c.Assert(err, IsNil)
+	c.Assert(merge3node.ID().String(), Equals, merge3commit.ID().String())
+	tree, err := merge3node.Tree()
+	c.Assert(err, IsNil)
+	c.Assert(tree.ID().String(), Equals, merge3commit.TreeHash.String())
+}
+
+func (s *CommitNodeSuite) TestObjectGraph(c *C) {
+	f := fixtures.ByTag("commit-graph").One()
+	storer := unpackRepository(f)
+
+	nodeIndex := NewObjectCommitNodeIndex(storer)
+	testWalker(c, nodeIndex)
+	testParents(c, nodeIndex)
+	testCommitAndTree(c, nodeIndex)
+}
+
+func (s *CommitNodeSuite) TestCommitGraph(c *C) {
+	f := fixtures.ByTag("commit-graph").One()
+	storer := unpackRepository(f)
+	reader, err := storer.Filesystem().Open(path.Join("objects", "info", "commit-graph"))
+	c.Assert(err, IsNil)
+	defer reader.Close()
+	index, err := commitgraph.OpenFileIndex(reader)
+	c.Assert(err, IsNil)
+
+	nodeIndex := NewGraphCommitNodeIndex(index, storer)
+	testWalker(c, nodeIndex)
+	testParents(c, nodeIndex)
+	testCommitAndTree(c, nodeIndex)
+}
+
+func (s *CommitNodeSuite) TestMixedGraph(c *C) {
+	f := fixtures.ByTag("commit-graph").One()
+	storer := unpackRepository(f)
+
+	// Take the commit-graph file and copy it to memory index without the last commit
+	reader, err := storer.Filesystem().Open(path.Join("objects", "info", "commit-graph"))
+	c.Assert(err, IsNil)
+	defer reader.Close()
+	fileIndex, err := commitgraph.OpenFileIndex(reader)
+	c.Assert(err, IsNil)
+	memoryIndex := commitgraph.NewMemoryIndex()
+	for i, hash := range fileIndex.Hashes() {
+		if hash.String() != "b9d69064b190e7aedccf84731ca1d917871f8a1c" {
+			node, err := fileIndex.GetCommitDataByIndex(i)
+			c.Assert(err, IsNil)
+			memoryIndex.Add(hash, node)
+		}
+	}
+
+	nodeIndex := NewGraphCommitNodeIndex(memoryIndex, storer)
+	testWalker(c, nodeIndex)
+	testParents(c, nodeIndex)
+	testCommitAndTree(c, nodeIndex)
+}
diff --git a/plumbing/protocol/packp/ulreq_decode.go b/plumbing/protocol/packp/ulreq_decode.go
index 895a3bf..3da2998 100644
--- a/plumbing/protocol/packp/ulreq_decode.go
+++ b/plumbing/protocol/packp/ulreq_decode.go
@@ -43,7 +43,7 @@ func (d *ulReqDecoder) Decode(v *UploadRequest) error {
 	return d.err
 }
 
-// fills out the parser stiky error
+// fills out the parser sticky error
 func (d *ulReqDecoder) error(format string, a ...interface{}) {
 	msg := fmt.Sprintf(
 		"pkt-line %d: %s", d.nLine,
diff --git a/plumbing/protocol/packp/ulreq_decode_test.go b/plumbing/protocol/packp/ulreq_decode_test.go
index efcc7b4..7658922 100644
--- a/plumbing/protocol/packp/ulreq_decode_test.go
+++ b/plumbing/protocol/packp/ulreq_decode_test.go
@@ -398,7 +398,7 @@ func (s *UlReqDecodeSuite) TestDeepenCommits(c *C) {
 	c.Assert(int(commits), Equals, 1234)
 }
 
-func (s *UlReqDecodeSuite) TestDeepenCommitsInfiniteInplicit(c *C) {
+func (s *UlReqDecodeSuite) TestDeepenCommitsInfiniteImplicit(c *C) {
 	payloads := []string{
 		"want 3333333333333333333333333333333333333333 ofs-delta multi_ack",
 		"deepen 0",
diff --git a/plumbing/transport/common.go b/plumbing/transport/common.go
index c6a054a..b05437f 100644
--- a/plumbing/transport/common.go
+++ b/plumbing/transport/common.go
@@ -108,7 +108,7 @@ type Endpoint struct {
 	// Host is the host.
 	Host string
 	// Port is the port to connect, if 0 the default port for the given protocol
-	// wil be used.
+	// will be used.
 	Port int
 	// Path is the repository path.
 	Path string
diff --git a/remote.go b/remote.go
index 679e0af..2ffffe7 100644
--- a/remote.go
+++ b/remote.go
@@ -614,7 +614,7 @@ func (r *Remote) addOrUpdateReferences(
 	req *packp.ReferenceUpdateRequest,
 	forceWithLease *ForceWithLease,
 ) error {
-	// If it is not a wilcard refspec we can directly search for the reference
+	// If it is not a wildcard refspec we can directly search for the reference
 	// in the references dictionary.
 	if !rs.IsWildcard() {
 		ref, ok := refsDict[rs.Src()]
@@ -693,7 +693,7 @@ func (r *Remote) addCommit(rs config.RefSpec,
 	remoteRef, err := remoteRefs.Reference(cmd.Name)
 	if err == nil {
 		if remoteRef.Type() != plumbing.HashReference {
-			//TODO: check actual git behavior here
+			// TODO: check actual git behavior here
 			return nil
 		}
 
@@ -735,7 +735,7 @@ func (r *Remote) addReferenceIfRefSpecMatches(rs config.RefSpec,
 	remoteRef, err := remoteRefs.Reference(cmd.Name)
 	if err == nil {
 		if remoteRef.Type() != plumbing.HashReference {
-			//TODO: check actual git behavior here
+			// TODO: check actual git behavior here
 			return nil
 		}
 
diff --git a/remote_test.go b/remote_test.go
index ca5f261..e0c3332 100644
--- a/remote_test.go
+++ b/remote_test.go
@@ -196,7 +196,7 @@ func (s *RemoteSuite) TestFetchToNewBranchWithAllTags(c *C) {
 	})
 }
 
-func (s *RemoteSuite) TestFetchNonExistantReference(c *C) {
+func (s *RemoteSuite) TestFetchNonExistentReference(c *C) {
 	r := NewRemote(memory.NewStorage(), &config.RemoteConfig{
 		URLs: []string{s.GetLocalRepositoryURL(fixtures.ByTag("tags").One())},
 	})
diff --git a/utils/binary/read.go b/utils/binary/read.go
index a14d48d..b8f9df1 100644
--- a/utils/binary/read.go
+++ b/utils/binary/read.go
@@ -1,4 +1,4 @@
-// Package binary implements sintax-sugar functions on top of the standard
+// Package binary implements syntax-sugar functions on top of the standard
 // library binary package
 package binary
 
diff --git a/utils/merkletrie/difftree.go b/utils/merkletrie/difftree.go
index 9f5145a..8090942 100644
--- a/utils/merkletrie/difftree.go
+++ b/utils/merkletrie/difftree.go
@@ -55,7 +55,7 @@ package merkletrie
 // Here is a full list of all the cases that are similar and how to
 // merge them together into more general cases.  Each general case
 // is labeled with an uppercase letter for further reference, and it
-// is followed by the pseudocode of the checks you have to perfrom
+// is followed by the pseudocode of the checks you have to perform
 // on both noders to see if you are in such a case, the actions to
 // perform (i.e. what changes to output) and how to advance the
 // iterators of each tree to continue the comparison process.
diff --git a/utils/merkletrie/internal/fsnoder/file.go b/utils/merkletrie/internal/fsnoder/file.go
index 0bb908b..453efee 100644
--- a/utils/merkletrie/internal/fsnoder/file.go
+++ b/utils/merkletrie/internal/fsnoder/file.go
@@ -32,7 +32,7 @@ func newFile(name, contents string) (*file, error) {
 func (f *file) Hash() []byte {
 	if f.hash == nil {
 		h := fnv.New64a()
-		h.Write([]byte(f.contents)) // it nevers returns an error.
+		h.Write([]byte(f.contents)) // it never returns an error.
 		f.hash = h.Sum(nil)
 	}
 
diff --git a/worktree_test.go b/worktree_test.go
index c69c617..712695a 100644
--- a/worktree_test.go
+++ b/worktree_test.go
@@ -903,7 +903,7 @@ func (s *WorktreeSuite) TestStatusCheckedInBeforeIgnored(c *C) {
 	c.Assert(status.IsClean(), Equals, true)
 	c.Assert(status, NotNil)
 
-	err = util.WriteFile(fs, "secondIgnoredFile", []byte("Should be completly ignored"), 0755)
+	err = util.WriteFile(fs, "secondIgnoredFile", []byte("Should be completely ignored"), 0755)
 	c.Assert(err, IsNil)
 	status = nil
 	status, err = w.Status()