diff options
| author | Paulo Gomes <pjbgf@linux.com> | 2023-05-15 20:22:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-15 20:22:28 +0100 |
| commit | 4ff2213cc5422d3300cf9828ea0781820888d32d (patch) | |
| tree | 9226bdd5f898f0813126e6df5f99ddf2bfec08c5 /worktree.go | |
| parent | dc2b346ed149080199d578f0190f3ac1156480c2 (diff) | |
| parent | bddd89e697ebdaad2fe341b3e8a3233691f5544a (diff) | |
| download | go-git-4ff2213cc5422d3300cf9828ea0781820888d32d.tar.gz | |
Merge pull request #770 from pjbgf/small-fixes
*: Small fixes across the codebase
Diffstat (limited to 'worktree.go')
| -rw-r--r-- | worktree.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/worktree.go b/worktree.go index 7d2f3b4..595dcea 100644 --- a/worktree.go +++ b/worktree.go @@ -5,7 +5,6 @@ import ( "errors" "fmt" "io" - stdioutil "io/ioutil" "os" "path/filepath" "strings" @@ -569,7 +568,7 @@ func (w *Worktree) checkoutFileSymlink(f *object.File) (err error) { defer ioutil.CheckClose(from, &err) - bytes, err := stdioutil.ReadAll(from) + bytes, err := io.ReadAll(from) if err != nil { return } @@ -718,7 +717,7 @@ func (w *Worktree) readGitmodulesFile() (*config.Modules, error) { } defer f.Close() - input, err := stdioutil.ReadAll(f) + input, err := io.ReadAll(f) if err != nil { return nil, err } |