Convert LazyRepo to struct containing repo

Author: spenserblack

commit.go

@@ -20,12 +20,7 @@ func (r *LazyRepo) Commit() (hash plumbing.Hash, msg string, err error) {
 		return
 	}
 
-	wt, err := r.worktree()
-	if err != nil {
-		return
-	}
-
-	hash, err = wt.Commit(msg, &git.CommitOptions{})
+	hash, err = r.wt.Commit(msg, &git.CommitOptions{})
 	return
 }
 

lazycommit.go

@@ -5,15 +5,25 @@ package lazycommit
 import "github.com/go-git/go-git/v5"
 
 // LazyRepo is a wrapper around go-git's Repository for simpler usage.
-type LazyRepo git.Repository
+type LazyRepo struct {
+	*git.Repository
+	wt *git.Worktree
+}
 
 // OpenRepo opens a repository at the given path.
 func OpenRepo(path string) (*LazyRepo, error) {
 	repo, err := git.PlainOpen(path)
 	if err != nil {
 		return nil, err
 	}
-	return (*LazyRepo)(repo), nil
+	wt, err := repo.Worktree()
+	if err != nil {
+		return nil, err
+	}
+	return &LazyRepo{
+		Repository: repo,
+		wt:         wt,
+	}, nil
 }
 
 // NoStaged checks if there are no staged changes (added files, changed files, removed files)
@@ -35,23 +45,10 @@ func (r *LazyRepo) NoStaged() (bool, error) {
 
 // StageAll stages all changes in the repository.
 func (r *LazyRepo) StageAll() error {
-	wt, err := (*git.Repository)(r).Worktree()
-	if err != nil {
-		return err
-	}
-	return wt.AddWithOptions(&git.AddOptions{All: true})
-}
-
-// Worktree gets the repo's worktree.
-func (r *LazyRepo) worktree() (*git.Worktree, error) {
-	return (*git.Repository)(r).Worktree()
+	return r.wt.AddWithOptions(&git.AddOptions{All: true})
 }
 
 // Status gets the repo's status.
 func (r *LazyRepo) status() (git.Status, error) {
-	wt, err := r.worktree()
-	if err != nil {
-		return nil, err
-	}
-	return wt.Status()
+	return r.wt.Status()
 }