diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2019-11-01 10:08:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-01 10:08:16 +0100 |
| commit | 1a7db85bca7027d90afdb5ce711622aaac9feaed (patch) | |
| tree | c550ea453e67a95a22b3dd557b4e1d5044bd5737 /plumbing/format | |
| parent | 3895dfa31c54adf83fdaffd90cf1b5fd4e5d7ff0 (diff) | |
| parent | 81627ab53e269a762b769b47c004cb4309452492 (diff) | |
| download | go-git-1a7db85bca7027d90afdb5ce711622aaac9feaed.tar.gz | |
Merge pull request #1231 from alexandear/fix-typos
*: fix typos in comments, variables and function names
Diffstat (limited to 'plumbing/format')
| -rw-r--r-- | plumbing/format/idxfile/decoder.go | 2 | ||||
| -rw-r--r-- | plumbing/format/index/decoder_test.go | 2 | ||||
| -rw-r--r-- | plumbing/format/index/encoder_test.go | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/plumbing/format/idxfile/decoder.go b/plumbing/format/idxfile/decoder.go index 9e9c176..d1a8a2c 100644 --- a/plumbing/format/idxfile/decoder.go +++ b/plumbing/format/idxfile/decoder.go @@ -12,7 +12,7 @@ import ( var ( // ErrUnsupportedVersion is returned by Decode when the idx file version // is not supported. - ErrUnsupportedVersion = errors.New("Unsuported version") + ErrUnsupportedVersion = errors.New("Unsupported version") // ErrMalformedIdxFile is returned by Decode when the idx file is corrupted. ErrMalformedIdxFile = errors.New("Malformed IDX file") ) diff --git a/plumbing/format/index/decoder_test.go b/plumbing/format/index/decoder_test.go index 7468ad0..92d312d 100644 --- a/plumbing/format/index/decoder_test.go +++ b/plumbing/format/index/decoder_test.go @@ -115,7 +115,7 @@ func (s *IndexSuite) TestDecodeMergeConflict(c *C) { {TheirMode, "14f8e368114f561c38e134f6e68ea6fea12d77ed"}, } - // stagged files + // staged files for i, e := range idx.Entries[4:7] { c.Assert(e.Stage, Equals, expected[i].Stage) c.Assert(e.CreatedAt.IsZero(), Equals, true) diff --git a/plumbing/format/index/encoder_test.go b/plumbing/format/index/encoder_test.go index 78cbbba..ea121fc 100644 --- a/plumbing/format/index/encoder_test.go +++ b/plumbing/format/index/encoder_test.go @@ -55,7 +55,7 @@ func (s *IndexSuite) TestEncode(c *C) { } -func (s *IndexSuite) TestEncodeUnsuportedVersion(c *C) { +func (s *IndexSuite) TestEncodeUnsupportedVersion(c *C) { idx := &Index{Version: 3} buf := bytes.NewBuffer(nil) @@ -64,7 +64,7 @@ func (s *IndexSuite) TestEncodeUnsuportedVersion(c *C) { c.Assert(err, Equals, ErrUnsupportedVersion) } -func (s *IndexSuite) TestEncodeWithIntentToAddUnsuportedVersion(c *C) { +func (s *IndexSuite) TestEncodeWithIntentToAddUnsupportedVersion(c *C) { idx := &Index{ Version: 2, Entries: []*Entry{{IntentToAdd: true}}, @@ -76,7 +76,7 @@ func (s *IndexSuite) TestEncodeWithIntentToAddUnsuportedVersion(c *C) { c.Assert(err, Equals, ErrUnsupportedVersion) } -func (s *IndexSuite) TestEncodeWithSkipWorktreeUnsuportedVersion(c *C) { +func (s *IndexSuite) TestEncodeWithSkipWorktreeUnsupportedVersion(c *C) { idx := &Index{ Version: 2, Entries: []*Entry{{SkipWorktree: true}}, |