From d24e1e9a69c2082763db51959121d3936e621658 Mon Sep 17 00:00:00 2001 From: Máximo Cuadros Date: Mon, 30 Jan 2017 11:27:11 +0100 Subject: Repository.Worktree, removing custom fs --- repository.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'repository.go') diff --git a/repository.go b/repository.go index c49042f..82ebb0c 100644 --- a/repository.go +++ b/repository.go @@ -472,7 +472,7 @@ func (r *Repository) updateWorktree() error { return nil } - w, err := r.Worktree(nil) + w, err := r.Worktree() if err != nil { return err } @@ -625,14 +625,10 @@ func (r *Repository) References() (storer.ReferenceIter, error) { // Worktree returns a worktree based on the given fs, if nil the default // worktree will be used. -func (r *Repository) Worktree(fs billy.Filesystem) (*Worktree, error) { - if r.wt == nil && fs == nil { +func (r *Repository) Worktree() (*Worktree, error) { + if r.wt == nil { return nil, ErrIsBareRepository } - if fs == nil { - fs = r.wt - } - - return &Worktree{r: r, fs: fs}, nil + return &Worktree{r: r, fs: r.wt}, nil } -- cgit