Merge branch 'master' into add-g

Author: ajnavarro

references.go

@@ -236,12 +236,8 @@ func (i *referenceIter) NewIterator(repo *Repository) (RowRepoIter, error) {
 	}
 
 	head, err := repo.Repo.Head()
-	if err != nil {
-		if err != plumbing.ErrReferenceNotFound {
-			return nil, err
-		}
-
-		logrus.WithField("repo", repo.ID).Debug("unable to get HEAD of repository")
+	if err != nil && err != plumbing.ErrReferenceNotFound {
+		return nil, err
 	}
 
 	return &referenceIter{
@@ -303,12 +299,8 @@ func (i *filteredReferencesIter) NewIterator(repo *Repository) (RowRepoIter, err
 	}
 
 	head, err := repo.Repo.Head()
-	if err != nil {
-		if err != plumbing.ErrReferenceNotFound {
-			return nil, err
-		}
-
-		logrus.WithField("repo", repo.ID).Debug("unable to get HEAD of repository")
+	if err != nil && err != plumbing.ErrReferenceNotFound {
+		return nil, err
 	}
 
 	return &filteredReferencesIter{

squash_iterator.go

@@ -491,9 +491,8 @@ func (i *squashRefIter) Advance() error {
 			}
 
 			i.head, err = i.repo.Repo.Head()
-			if err == plumbing.ErrReferenceNotFound {
-				logrus.WithField("repo", i.repo.ID).Debug("unable to get HEAD of repository")
-			} else if err != nil && !i.skipGitErrors {
+			if err != nil && !i.skipGitErrors &&
+				err != plumbing.ErrReferenceNotFound {
 				return err
 			}
 		}
@@ -636,13 +635,10 @@ func (i *squashRepoRefsIter) Advance() error {
 			}
 
 			i.head, err = i.repos.Repository().Repo.Head()
-			if err != nil {
-				if err != plumbing.ErrReferenceNotFound && !i.skipGitErrors {
-					return err
-				}
-
-				logrus.WithField("repo", i.repos.Repository().ID).
-					Debug("unable to get HEAD of repository")
+			if err != nil &&
+				err != plumbing.ErrReferenceNotFound &&
+				!i.skipGitErrors {
+				return err
 			}
 		}
 
@@ -781,13 +777,10 @@ func (i *squashRemoteRefsIter) Advance() error {
 			}
 
 			i.head, err = i.Repository().Repo.Head()
-			if err != nil {
-				if err != plumbing.ErrReferenceNotFound && !i.skipGitErrors {
-					return err
-				}
-
-				logrus.WithField("repo", i.remotes.Remote().RepoID).
-					Debug("unable to get HEAD of repository")
+			if err != nil &&
+				err != plumbing.ErrReferenceNotFound &&
+				!i.skipGitErrors {
+				return err
 			}
 		}