Merge pull request #1231 from alexandear/fix-typos

*: fix typos in comments, variables and function names

3 files changed, 8 insertions, 8 deletions

diff --git a/plumbing/object/commit_stats_test.go b/plumbing/object/commit_stats_test.go
index 2fb3f08..dc9e4ad 100644
--- a/plumbing/object/commit_stats_test.go
+++ b/plumbing/object/commit_stats_test.go
@@ -22,7 +22,7 @@ type CommitStatsSuite struct {
 var _ = Suite(&CommitStatsSuite{})
 
 func (s *CommitStatsSuite) TestStats(c *C) {
-	r, hash := s.writeHisotry(c, []byte("foo\n"), []byte("foo\nbar\n"))
+	r, hash := s.writeHistory(c, []byte("foo\n"), []byte("foo\nbar\n"))
 
 	aCommit, err := r.CommitObject(hash)
 	c.Assert(err, IsNil)
@@ -37,7 +37,7 @@ func (s *CommitStatsSuite) TestStats(c *C) {
 }
 
 func (s *CommitStatsSuite) TestStats_RootCommit(c *C) {
-	r, hash := s.writeHisotry(c, []byte("foo\n"))
+	r, hash := s.writeHistory(c, []byte("foo\n"))
 
 	aCommit, err := r.CommitObject(hash)
 	c.Assert(err, IsNil)
@@ -53,7 +53,7 @@ func (s *CommitStatsSuite) TestStats_RootCommit(c *C) {
 }
 
 func (s *CommitStatsSuite) TestStats_WithoutNewLine(c *C) {
-	r, hash := s.writeHisotry(c, []byte("foo\nbar"), []byte("foo\nbar\n"))
+	r, hash := s.writeHistory(c, []byte("foo\nbar"), []byte("foo\nbar\n"))
 
 	aCommit, err := r.CommitObject(hash)
 	c.Assert(err, IsNil)
@@ -67,7 +67,7 @@ func (s *CommitStatsSuite) TestStats_WithoutNewLine(c *C) {
 	c.Assert(fileStats[0].String(), Equals, " foo | 2 +-\n")
 }
 
-func (s *CommitStatsSuite) writeHisotry(c *C, files ...[]byte) (*git.Repository, plumbing.Hash) {
+func (s *CommitStatsSuite) writeHistory(c *C, files ...[]byte) (*git.Repository, plumbing.Hash) {
 	cm := &git.CommitOptions{
 		Author: &object.Signature{Name: "Foo", Email: "foo@example.local", When: time.Now()},
 	}
diff --git a/plumbing/object/commit_walker_bfs_filtered.go b/plumbing/object/commit_walker_bfs_filtered.go
index b12523d..7b17f15 100644
--- a/plumbing/object/commit_walker_bfs_filtered.go
+++ b/plumbing/object/commit_walker_bfs_filtered.go
@@ -15,7 +15,7 @@ import (
 // If the commit history can not be traversed, or the Close() method is called,
 // the CommitIter won't return more commits.
 // If no isValid is passed, all ancestors of from commit will be valid.
-// If no isLimit is limmit, all ancestors of all commits will be visited.
+// If no isLimit is limit, all ancestors of all commits will be visited.
 func NewFilterCommitIter(
 	from *Commit,
 	isValid *CommitFilter,
@@ -50,7 +50,7 @@ func NewFilterCommitIter(
 // CommitFilter returns a boolean for the passed Commit
 type CommitFilter func(*Commit) bool
 
-// filterCommitIter implments CommitIter
+// filterCommitIter implements CommitIter
 type filterCommitIter struct {
 	isValid CommitFilter
 	isLimit CommitFilter
diff --git a/plumbing/object/merge_base_test.go b/plumbing/object/merge_base_test.go
index 598539d..72c9cd9 100644
--- a/plumbing/object/merge_base_test.go
+++ b/plumbing/object/merge_base_test.go
@@ -48,8 +48,8 @@ candidates           result
  CD1, CD2, M, N       CD1, CD2    M and N are reachable from CD2, so they're not
  C, G, dev, M, N      C, G, dev   M and N are reachable from G, so they're not
  C, D, M, N           C, D        M and N are reachable from C, so they're not
- A, A^, A, N, N^      A, N        A^ and N^ are rechable from A and N
- A^^^, A^, A^^, A, N  A, N        A^^^, A^^ and A^ are rechable from A, so they're not
+ A, A^, A, N, N^      A, N        A^ and N^ are reachable from A and N
+ A^^^, A^, A^^, A, N  A, N        A^^^, A^^ and A^ are reachable from A, so they're not
 
 IsAncestor
 ----------------------------