aboutsummaryrefslogtreecommitdiffstats
path: root/remote.go
diff options
context:
space:
mode:
authorMáximo Cuadros <mcuadros@gmail.com>2017-11-27 14:57:58 +0100
committerGitHub <noreply@github.com>2017-11-27 14:57:58 +0100
commit4e51e9e877e4e70c320bdda7e44d61618c6ae900 (patch)
tree791b48688be56d5936f9384559b234dfddf9a885 /remote.go
parent60c567f0a3c22ac53f219fcc6482ee0e2ff425e6 (diff)
parentc606e9fd6c4a8b9a49d3d276d1547f985accc92f (diff)
downloadgo-git-4e51e9e877e4e70c320bdda7e44d61618c6ae900.tar.gz
Merge pull request #661 from ferhatelmas/ineffassign
all: fixes for ineffective assign
Diffstat (limited to 'remote.go')
-rw-r--r--remote.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/remote.go b/remote.go
index e9e915c..2416152 100644
--- a/remote.go
+++ b/remote.go
@@ -705,7 +705,7 @@ func isFastForward(s storer.EncodedObjectStorer, old, new plumbing.Hash) (bool,
found := false
iter := object.NewCommitPreorderIter(c, nil, nil)
- return found, iter.ForEach(func(c *object.Commit) error {
+ err = iter.ForEach(func(c *object.Commit) error {
if c.Hash != old {
return nil
}
@@ -713,6 +713,7 @@ func isFastForward(s storer.EncodedObjectStorer, old, new plumbing.Hash) (bool,
found = true
return storer.ErrStop
})
+ return found, err
}
func (r *Remote) newUploadPackRequest(o *FetchOptions,