Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

Commit 1a7db85

Browse files
authored
Merge pull request #1231 from alexandear/fix-typos
*: fix typos in comments, variables and function names
2 parents 3895dfa + 81627ab commit 1a7db85

38 files changed

+70
-70
lines changed

_examples/ls-remote/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func main() {
1919

2020
log.Print("Fetching tags...")
2121

22-
// We can then use every Remote functions to retrieve wanted informations
22+
// We can then use every Remote functions to retrieve wanted information
2323
refs, err := rem.List(&git.ListOptions{})
2424
if err != nil {
2525
log.Fatal(err)

_examples/merge_base/helpers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func checkIfError(err error, code exitCode, mainReason string, v ...interface{})
1313
return
1414
}
1515

16-
printErr(wrappErr(err, mainReason, v...))
16+
printErr(wrapErr(err, mainReason, v...))
1717
os.Exit(int(code))
1818
}
1919

@@ -52,7 +52,7 @@ func printCommits(commits []*object.Commit) {
5252
}
5353
}
5454

55-
func wrappErr(err error, s string, v ...interface{}) error {
55+
func wrapErr(err error, s string, v ...interface{}) error {
5656
if err != nil {
5757
return fmt.Errorf("%s\n %s", fmt.Sprintf(s, v...), err)
5858
}

_examples/progress/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func main() {
2222

2323
// as git does, when you make a clone, pull or some other operations the
2424
// server sends information via the sideband, this information can being
25-
// collected provinding a io.Writer to the CloneOptions options
25+
// collected providing a io.Writer to the CloneOptions options
2626
Progress: os.Stdout,
2727
})
2828

_examples/tag/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ func main() {
1515
CheckArgs("<path>")
1616
path := os.Args[1]
1717

18-
// We instanciate a new repository targeting the given path (the .git folder)
18+
// We instantiate a new repository targeting the given path (the .git folder)
1919
r, err := git.PlainOpen(path)
2020
CheckIfError(err)
2121

config/branch_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (b *BranchSuite) TestValidateMerge(c *C) {
3838
c.Assert(badBranch.Validate(), NotNil)
3939
}
4040

41-
func (b *BranchSuite) TestMarshall(c *C) {
41+
func (b *BranchSuite) TestMarshal(c *C) {
4242
expected := []byte(`[core]
4343
bare = false
4444
[branch "branch-tracking-on-clone"]
@@ -60,7 +60,7 @@ func (b *BranchSuite) TestMarshall(c *C) {
6060
c.Assert(string(actual), Equals, string(expected))
6161
}
6262

63-
func (b *BranchSuite) TestUnmarshall(c *C) {
63+
func (b *BranchSuite) TestUnmarshal(c *C) {
6464
input := []byte(`[core]
6565
bare = false
6666
[branch "branch-tracking-on-clone"]

config/config_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ type ConfigSuite struct{}
99

1010
var _ = Suite(&ConfigSuite{})
1111

12-
func (s *ConfigSuite) TestUnmarshall(c *C) {
12+
func (s *ConfigSuite) TestUnmarshal(c *C) {
1313
input := []byte(`[core]
1414
bare = true
1515
worktree = foo
@@ -60,7 +60,7 @@ func (s *ConfigSuite) TestUnmarshall(c *C) {
6060
c.Assert(cfg.Branches["master"].Merge, Equals, plumbing.ReferenceName("refs/heads/master"))
6161
}
6262

63-
func (s *ConfigSuite) TestMarshall(c *C) {
63+
func (s *ConfigSuite) TestMarshal(c *C) {
6464
output := []byte(`[core]
6565
bare = true
6666
worktree = bar
@@ -119,7 +119,7 @@ func (s *ConfigSuite) TestMarshall(c *C) {
119119
c.Assert(string(b), Equals, string(output))
120120
}
121121

122-
func (s *ConfigSuite) TestUnmarshallMarshall(c *C) {
122+
func (s *ConfigSuite) TestUnmarshalMarshal(c *C) {
123123
input := []byte(`[core]
124124
bare = true
125125
worktree = foo

config/modules_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func (s *ModulesSuite) TestValidateMissingName(c *C) {
3939
c.Assert(m.Validate(), Equals, ErrModuleEmptyPath)
4040
}
4141

42-
func (s *ModulesSuite) TestMarshall(c *C) {
42+
func (s *ModulesSuite) TestMarshal(c *C) {
4343
input := []byte(`[submodule "qux"]
4444
path = qux
4545
url = baz
@@ -54,7 +54,7 @@ func (s *ModulesSuite) TestMarshall(c *C) {
5454
c.Assert(output, DeepEquals, input)
5555
}
5656

57-
func (s *ModulesSuite) TestUnmarshall(c *C) {
57+
func (s *ModulesSuite) TestUnmarshal(c *C) {
5858
input := []byte(`[submodule "qux"]
5959
path = qux
6060
url = https://github.com/foo/qux.git
@@ -79,7 +79,7 @@ func (s *ModulesSuite) TestUnmarshall(c *C) {
7979
c.Assert(cfg.Submodules["foo/bar"].Branch, Equals, "dev")
8080
}
8181

82-
func (s *ModulesSuite) TestUnmarshallMarshall(c *C) {
82+
func (s *ModulesSuite) TestUnmarshalMarshal(c *C) {
8383
input := []byte(`[submodule "foo/bar"]
8484
path = foo/bar
8585
url = https://github.com/foo/bar.git

internal/revision/parser.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Package revision extracts git revision from string
2-
// More informations about revision : https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html
2+
// More information about revision : https://www.kernel.org/pub/software/scm/git/docs/gitrevisions.html
33
package revision
44

55
import (

internal/revision/parser_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ func (s *ParserSuite) TestParseRefWithValidName(c *C) {
366366
}
367367
}
368368

369-
func (s *ParserSuite) TestParseRefWithUnvalidName(c *C) {
369+
func (s *ParserSuite) TestParseRefWithInvalidName(c *C) {
370370
datas := map[string]error{
371371
".master": &ErrInvalidRevision{`must not start with "."`},
372372
"/master": &ErrInvalidRevision{`must not start with "/"`},

internal/revision/scanner.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
// validates it belongs to a rune category
1111
type runeCategoryValidator func(r rune) bool
1212

13-
// tokenizeExpression aggegates a series of runes matching check predicate into a single
13+
// tokenizeExpression aggregates a series of runes matching check predicate into a single
1414
// string and provides given tokenType as token type
1515
func tokenizeExpression(ch rune, tokenType token, check runeCategoryValidator, r *bufio.Reader) (token, string, error) {
1616
var data []rune

0 commit comments

Comments
 (0)