aboutsummaryrefslogtreecommitdiffstats
path: root/plumbing
diff options
context:
space:
mode:
authorMáximo Cuadros <mcuadros@gmail.com>2017-11-20 11:16:47 +0100
committerGitHub <noreply@github.com>2017-11-20 11:16:47 +0100
commit5cf1147e1b891aee85fdd66d24cb5e8cf86531ce (patch)
treea0a4550273fd15ecb04ad6b548f13c8e3cfce2d7 /plumbing
parent6abcb9798743579819719eb7328f2a7bdc8a882e (diff)
parentd9b8691c6b137bb59ee185f69acf868a8f42b77d (diff)
downloadgo-git-5cf1147e1b891aee85fdd66d24cb5e8cf86531ce.tar.gz
Merge pull request #647 from ferhatelmas/typo-fixes
examples,plumbing,utils: typo fixes
Diffstat (limited to 'plumbing')
-rw-r--r--plumbing/object/change_adaptor.go2
-rw-r--r--plumbing/object/tag.go2
-rw-r--r--plumbing/protocol/packp/advrefs_decode.go2
-rw-r--r--plumbing/protocol/packp/srvresp.go4
-rw-r--r--plumbing/protocol/packp/ulreq.go2
-rw-r--r--plumbing/storer/object.go6
-rw-r--r--plumbing/storer/reference.go2
7 files changed, 10 insertions, 10 deletions
diff --git a/plumbing/object/change_adaptor.go b/plumbing/object/change_adaptor.go
index 49b6545..491c399 100644
--- a/plumbing/object/change_adaptor.go
+++ b/plumbing/object/change_adaptor.go
@@ -8,7 +8,7 @@ import (
"gopkg.in/src-d/go-git.v4/utils/merkletrie/noder"
)
-// The folowing functions transform changes types form the merkletrie
+// The following functions transform changes types form the merkletrie
// package to changes types from this package.
func newChange(c merkletrie.Change) (*Change, error) {
diff --git a/plumbing/object/tag.go b/plumbing/object/tag.go
index 7b091d0..d8b71a0 100644
--- a/plumbing/object/tag.go
+++ b/plumbing/object/tag.go
@@ -252,7 +252,7 @@ func (iter *TagIter) Next() (*Tag, error) {
}
// ForEach call the cb function for each tag contained on this iter until
-// an error happends or the end of the iter is reached. If ErrStop is sent
+// an error happens or the end of the iter is reached. If ErrStop is sent
// the iteration is stop but no error is returned. The iterator is closed.
func (iter *TagIter) ForEach(cb func(*Tag) error) error {
return iter.EncodedObjectIter.ForEach(func(obj plumbing.EncodedObject) error {
diff --git a/plumbing/protocol/packp/advrefs_decode.go b/plumbing/protocol/packp/advrefs_decode.go
index e0a449e..1b4c62c 100644
--- a/plumbing/protocol/packp/advrefs_decode.go
+++ b/plumbing/protocol/packp/advrefs_decode.go
@@ -169,7 +169,7 @@ func decodeSkipNoRefs(p *advRefsDecoder) decoderStateFn {
return decodeCaps
}
-// decode the refname, expectes SP refname NULL
+// decode the refname, expects SP refname NULL
func decodeFirstRef(l *advRefsDecoder) decoderStateFn {
if len(l.line) < 3 {
l.error("line too short after hash")
diff --git a/plumbing/protocol/packp/srvresp.go b/plumbing/protocol/packp/srvresp.go
index b214341..434e8aa 100644
--- a/plumbing/protocol/packp/srvresp.go
+++ b/plumbing/protocol/packp/srvresp.go
@@ -35,8 +35,8 @@ func (r *ServerResponse) Decode(reader *bufio.Reader, isMultiACK bool) error {
return err
}
- // we need to detect when the end of a response header and the begining
- // of a packfile header happend, some requests to the git daemon
+ // we need to detect when the end of a response header and the beginning
+ // of a packfile header happened, some requests to the git daemon
// produces a duplicate ACK header even when multi_ack is not supported.
stop, err := r.stopReading(reader)
if err != nil {
diff --git a/plumbing/protocol/packp/ulreq.go b/plumbing/protocol/packp/ulreq.go
index 7832007..74109d8 100644
--- a/plumbing/protocol/packp/ulreq.go
+++ b/plumbing/protocol/packp/ulreq.go
@@ -28,7 +28,7 @@ type Depth interface {
// DepthCommits values stores the maximum number of requested commits in
// the packfile. Zero means infinite. A negative value will have
-// undefined consecuences.
+// undefined consequences.
type DepthCommits int
func (d DepthCommits) isDepth() {}
diff --git a/plumbing/storer/object.go b/plumbing/storer/object.go
index 3f41468..e793211 100644
--- a/plumbing/storer/object.go
+++ b/plumbing/storer/object.go
@@ -123,7 +123,7 @@ func (iter *EncodedObjectLookupIter) Next() (plumbing.EncodedObject, error) {
}
// ForEach call the cb function for each object contained on this iter until
-// an error happends or the end of the iter is reached. If ErrStop is sent
+// an error happens or the end of the iter is reached. If ErrStop is sent
// the iteration is stop but no error is returned. The iterator is closed.
func (iter *EncodedObjectLookupIter) ForEach(cb func(plumbing.EncodedObject) error) error {
return ForEachIterator(iter, cb)
@@ -168,7 +168,7 @@ func (iter *EncodedObjectSliceIter) Next() (plumbing.EncodedObject, error) {
}
// ForEach call the cb function for each object contained on this iter until
-// an error happends or the end of the iter is reached. If ErrStop is sent
+// an error happens or the end of the iter is reached. If ErrStop is sent
// the iteration is stop but no error is returned. The iterator is closed.
func (iter *EncodedObjectSliceIter) ForEach(cb func(plumbing.EncodedObject) error) error {
return ForEachIterator(iter, cb)
@@ -213,7 +213,7 @@ func (iter *MultiEncodedObjectIter) Next() (plumbing.EncodedObject, error) {
}
// ForEach call the cb function for each object contained on this iter until
-// an error happends or the end of the iter is reached. If ErrStop is sent
+// an error happens or the end of the iter is reached. If ErrStop is sent
// the iteration is stop but no error is returned. The iterator is closed.
func (iter *MultiEncodedObjectIter) ForEach(cb func(plumbing.EncodedObject) error) error {
return ForEachIterator(iter, cb)
diff --git a/plumbing/storer/reference.go b/plumbing/storer/reference.go
index 988c784..5c21f23 100644
--- a/plumbing/storer/reference.go
+++ b/plumbing/storer/reference.go
@@ -121,7 +121,7 @@ func (iter *ReferenceSliceIter) Next() (*plumbing.Reference, error) {
}
// ForEach call the cb function for each reference contained on this iter until
-// an error happends or the end of the iter is reached. If ErrStop is sent
+// an error happens or the end of the iter is reached. If ErrStop is sent
// the iteration is stop but no error is returned. The iterator is closed.
func (iter *ReferenceSliceIter) ForEach(cb func(*plumbing.Reference) error) error {
defer iter.Close()