aboutsummaryrefslogtreecommitdiffstats
path: root/worktree.go
diff options
context:
space:
mode:
authorMáximo Cuadros <mcuadros@gmail.com>2020-07-06 01:52:08 +0200
committerGitHub <noreply@github.com>2020-07-06 01:52:08 +0200
commita9899594dfdde8bbfdf35fc7e8c2fc3ec5aa7fdb (patch)
treee7b28b456ef3ed90eafc026b506786bea5df179e /worktree.go
parent9ac753f4afb36feb1a1c22214c16e853db54aa00 (diff)
parentf9cf9a99fd51bff8e002900a3a73d117ba54c887 (diff)
downloadgo-git-a9899594dfdde8bbfdf35fc7e8c2fc3ec5aa7fdb.tar.gz
Merge pull request #117 from cristaloleg/fix-goreportcard
fix goreportcard warnings
Diffstat (limited to 'worktree.go')
-rw-r--r--worktree.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/worktree.go b/worktree.go
index d272373..62ad03b 100644
--- a/worktree.go
+++ b/worktree.go
@@ -93,7 +93,7 @@ func (w *Worktree) PullContext(ctx context.Context, o *PullOptions) error {
head, err := w.r.Head()
if err == nil {
- headAheadOfRef,err := isFastForward(w.r.Storer, ref.Hash(), head.Hash())
+ headAheadOfRef, err := isFastForward(w.r.Storer, ref.Hash(), head.Hash())
if err != nil {
return err
}
@@ -102,7 +102,6 @@ func (w *Worktree) PullContext(ctx context.Context, o *PullOptions) error {
return NoErrAlreadyUpToDate
}
-
ff, err := isFastForward(w.r.Storer, head.Hash(), ref.Hash())
if err != nil {
return err