diff options
author | Máximo Cuadros <mcuadros@gmail.com> | 2017-11-20 11:16:47 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-20 11:16:47 +0100 |
commit | 5cf1147e1b891aee85fdd66d24cb5e8cf86531ce (patch) | |
tree | a0a4550273fd15ecb04ad6b548f13c8e3cfce2d7 | |
parent | 6abcb9798743579819719eb7328f2a7bdc8a882e (diff) | |
parent | d9b8691c6b137bb59ee185f69acf868a8f42b77d (diff) | |
download | go-git-5cf1147e1b891aee85fdd66d24cb5e8cf86531ce.tar.gz |
Merge pull request #647 from ferhatelmas/typo-fixes
examples,plumbing,utils: typo fixes
-rw-r--r-- | _examples/commit/main.go | 4 | ||||
-rw-r--r-- | _examples/context/main.go | 2 | ||||
-rw-r--r-- | plumbing/object/change_adaptor.go | 2 | ||||
-rw-r--r-- | plumbing/object/tag.go | 2 | ||||
-rw-r--r-- | plumbing/protocol/packp/advrefs_decode.go | 2 | ||||
-rw-r--r-- | plumbing/protocol/packp/srvresp.go | 4 | ||||
-rw-r--r-- | plumbing/protocol/packp/ulreq.go | 2 | ||||
-rw-r--r-- | plumbing/storer/object.go | 6 | ||||
-rw-r--r-- | plumbing/storer/reference.go | 2 | ||||
-rw-r--r-- | utils/ioutil/common.go | 8 | ||||
-rw-r--r-- | utils/merkletrie/difftree.go | 2 | ||||
-rw-r--r-- | utils/merkletrie/iter.go | 2 | ||||
-rw-r--r-- | utils/merkletrie/noder/path.go | 2 |
13 files changed, 20 insertions, 20 deletions
diff --git a/_examples/commit/main.go b/_examples/commit/main.go index aeb1d4f..556cb9c 100644 --- a/_examples/commit/main.go +++ b/_examples/commit/main.go @@ -12,13 +12,13 @@ import ( "gopkg.in/src-d/go-git.v4/plumbing/object" ) -// Basic example of how to commit changes to the current branch to an existant +// Basic example of how to commit changes to the current branch to an existent // repository. func main() { CheckArgs("<directory>") directory := os.Args[1] - // Opens an already existant repository. + // Opens an already existent repository. r, err := git.PlainOpen(directory) CheckIfError(err) diff --git a/_examples/context/main.go b/_examples/context/main.go index 72885ff..f873055 100644 --- a/_examples/context/main.go +++ b/_examples/context/main.go @@ -9,7 +9,7 @@ import ( . "gopkg.in/src-d/go-git.v4/_examples" ) -// Gracefull cancellation example of a basic git operation such as Clone. +// Graceful cancellation example of a basic git operation such as Clone. func main() { CheckArgs("<url>", "<directory>") url := os.Args[1] 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() diff --git a/utils/ioutil/common.go b/utils/ioutil/common.go index 66044e2..e9dcbfe 100644 --- a/utils/ioutil/common.go +++ b/utils/ioutil/common.go @@ -123,13 +123,13 @@ type readerOnError struct { } // NewReaderOnError returns a io.Reader that call the notify function when an -// unexpected (!io.EOF) error happends, after call Read function. +// unexpected (!io.EOF) error happens, after call Read function. func NewReaderOnError(r io.Reader, notify func(error)) io.Reader { return &readerOnError{r, notify} } // NewReadCloserOnError returns a io.ReadCloser that call the notify function -// when an unexpected (!io.EOF) error happends, after call Read function. +// when an unexpected (!io.EOF) error happens, after call Read function. func NewReadCloserOnError(r io.ReadCloser, notify func(error)) io.ReadCloser { return NewReadCloser(NewReaderOnError(r, notify), r) } @@ -149,13 +149,13 @@ type writerOnError struct { } // NewWriterOnError returns a io.Writer that call the notify function when an -// unexpected (!io.EOF) error happends, after call Write function. +// unexpected (!io.EOF) error happens, after call Write function. func NewWriterOnError(w io.Writer, notify func(error)) io.Writer { return &writerOnError{w, notify} } // NewWriteCloserOnError returns a io.WriteCloser that call the notify function -//when an unexpected (!io.EOF) error happends, after call Write function. +//when an unexpected (!io.EOF) error happens, after call Write function. func NewWriteCloserOnError(w io.WriteCloser, notify func(error)) io.WriteCloser { return NewWriteCloser(NewWriterOnError(w, notify), w) } diff --git a/utils/merkletrie/difftree.go b/utils/merkletrie/difftree.go index 0748865..2294096 100644 --- a/utils/merkletrie/difftree.go +++ b/utils/merkletrie/difftree.go @@ -54,7 +54,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 wiht an uppercase letter for further reference, and it +// is labeled with an uppercase letter for further reference, and it // is followed by the pseudocode of the checks you have to perfrom // 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 diff --git a/utils/merkletrie/iter.go b/utils/merkletrie/iter.go index e3f3055..b4d4c99 100644 --- a/utils/merkletrie/iter.go +++ b/utils/merkletrie/iter.go @@ -198,7 +198,7 @@ func (iter *Iter) current() (noder.Path, error) { } // removes the current node if any, and all the frames that become empty as a -// consecuence of this action. +// consequence of this action. func (iter *Iter) drop() { frame, ok := iter.top() if !ok { diff --git a/utils/merkletrie/noder/path.go b/utils/merkletrie/noder/path.go index d2e2932..e9c905c 100644 --- a/utils/merkletrie/noder/path.go +++ b/utils/merkletrie/noder/path.go @@ -8,7 +8,7 @@ import ( ) // Path values represent a noder and its ancestors. The root goes first -// and the actual final noder the path is refering to will be the last. +// and the actual final noder the path is referring to will be the last. // // A path implements the Noder interface, redirecting all the interface // calls to its final noder. |