Merge pull request #1047 from avoidalone/master

pjbgf · web-flow · commit 6af38e000608 · 2024-03-12T08:01:13.000Z
chore: fix some comments
diff --git a/_examples/README.md b/_examples/README.md
@@ -33,4 +33,4 @@ Here you can find a list of annotated _go-git_ examples:
 - [custom_http](custom_http/main.go) - Replacing the HTTP client using a custom one.
 - [clone with context](context/main.go) - Cloning a repository with graceful cancellation.
 - [storage](storage/README.md) - Implementing a custom storage system.
-- [sha256](sha256/main.go) - Init and commiting repositories that use sha256 as object format.
+- [sha256](sha256/main.go) - Init and committing repositories that use sha256 as object format.
diff --git a/plumbing/format/gitignore/dir.go b/plumbing/format/gitignore/dir.go
@@ -116,7 +116,7 @@ func loadPatterns(fs billy.Filesystem, path string) (ps []Pattern, err error) {
 	return
 }
 
-// LoadGlobalPatterns loads gitignore patterns from from the gitignore file
+// LoadGlobalPatterns loads gitignore patterns from the gitignore file
 // declared in a user's ~/.gitconfig file.  If the ~/.gitconfig file does not
 // exist the function will return nil.  If the core.excludesfile property
 // is not declared, the function will return nil.  If the file pointed to by
@@ -132,7 +132,7 @@ func LoadGlobalPatterns(fs billy.Filesystem) (ps []Pattern, err error) {
 	return loadPatterns(fs, fs.Join(home, gitconfigFile))
 }
 
-// LoadSystemPatterns loads gitignore patterns from from the gitignore file
+// LoadSystemPatterns loads gitignore patterns from the gitignore file
 // declared in a system's /etc/gitconfig file.  If the /etc/gitconfig file does
 // not exist the function will return nil.  If the core.excludesfile property
 // is not declared, the function will return nil.  If the file pointed to by
diff --git a/repository.go b/repository.go
@@ -1807,7 +1807,7 @@ func (r *Repository) Merge(ref plumbing.Reference, opts MergeOptions) error {
 }
 
 // createNewObjectPack is a helper for RepackObjects taking care
-// of creating a new pack. It is used so the the PackfileWriter
+// of creating a new pack. It is used so the PackfileWriter
 // deferred close has the right scope.
 func (r *Repository) createNewObjectPack(cfg *RepackConfig) (h plumbing.Hash, err error) {
 	ow := newObjectWalker(r.Storer)

Original file line number	Diff line number	Diff line change
`@@ -1807,7 +1807,7 @@ func (r *Repository) Merge(ref plumbing.Reference, opts MergeOptions) error {`
`1807`	`1807`	`}`
`1808`	`1808`
`1809`	`1809`	`// createNewObjectPack is a helper for RepackObjects taking care`
`1810`		`-// of creating a new pack. It is used so the the PackfileWriter`
	`1810`	`+// of creating a new pack. It is used so the PackfileWriter`
`1811`	`1811`	`// deferred close has the right scope.`
`1812`	`1812`	`func (r Repository) createNewObjectPack(cfg RepackConfig) (h plumbing.Hash, err error) {`
`1813`	`1813`	`ow := newObjectWalker(r.Storer)`