Merge branch 'master' into gopkg

Author: ajnavarro

commits.go

@@ -229,12 +229,7 @@ func (i *commitIter) loadNextRef() (err error) {
 			return err
 		}
 
-		if i.ref.Type() != plumbing.HashReference {
-			i.ref = nil
-			continue
-		}
-
-		obj, err := i.repo.Object(plumbing.AnyObject, i.ref.Hash())
+		ignored, err := isIgnoredReference(i.repo.Repository, i.ref)
 		if err != nil {
 			if i.skipGitErrors {
 				continue
@@ -243,7 +238,7 @@ func (i *commitIter) loadNextRef() (err error) {
 			return err
 		}
 
-		if obj.Type() != plumbing.CommitObject {
+		if ignored {
 			continue
 		}
 

integration_test.go

@@ -594,7 +594,7 @@ func TestMissingHeadRefs(t *testing.T) {
 
 	rows, err := sql.RowIterToRows(iter)
 	require.NoError(err)
-	require.Len(rows, 56)
+	require.Len(rows, 54)
 }
 
 func BenchmarkQueries(b *testing.B) {

ref_commits.go

@@ -306,7 +306,16 @@ func (i *refCommitsRowIter) next() (sql.Row, error) {
 					return nil, err
 				}
 
-				if ref.Type() != plumbing.HashReference {
+				ignored, err := isIgnoredReference(i.repo.Repository, ref)
+				if err != nil {
+					if i.skipGitErrors {
+						continue
+					}
+
+					return nil, err
+				}
+
+				if ignored {
 					continue
 				}
 			} else {

references.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"strings"
 
+	git "gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-mysql-server.v0/sql"
 
 	"gopkg.in/src-d/go-git.v4/plumbing"
@@ -299,7 +300,16 @@ func (i *refRowIter) next() (sql.Row, error) {
 			return nil, err
 		}
 
-		if o.Type() != plumbing.HashReference {
+		ignored, err := isIgnoredReference(i.repo.Repository, o)
+		if err != nil {
+			if i.skipGitErrors {
+				continue
+			}
+
+			return nil, err
+		}
+
+		if ignored {
 			continue
 		}
 
@@ -340,3 +350,16 @@ func referenceToRow(repositoryID string, c *plumbing.Reference) sql.Row {
 		hash,
 	)
 }
+
+func isIgnoredReference(repo *git.Repository, ref *plumbing.Reference) (bool, error) {
+	if ref.Type() != plumbing.HashReference {
+		return true, nil
+	}
+
+	obj, err := repo.Object(plumbing.AnyObject, ref.Hash())
+	if err != nil {
+		return false, err
+	}
+
+	return obj.Type() != plumbing.CommitObject, nil
+}

squash_iterator.go

@@ -489,7 +489,16 @@ func (i *squashRefIter) Advance() error {
 			}
 		}
 
-		if ref.Type() != plumbing.HashReference {
+		ignored, err := isIgnoredReference(i.repo.Repository, ref)
+		if err != nil {
+			if i.skipGitErrors {
+				continue
+			}
+
+			return err
+		}
+
+		if ignored {
 			continue
 		}
 
@@ -734,11 +743,16 @@ func (i *squashRepoRefsIter) Advance() error {
 			}
 		}
 
-		if ref.Type() != plumbing.HashReference {
-			logrus.WithFields(logrus.Fields{
-				"type": ref.Type(),
-				"ref":  ref.Name(),
-			}).Debug("ignoring reference, it's not a hash reference")
+		ignored, err := isIgnoredReference(i.repos.Repository().Repository, ref)
+		if err != nil {
+			if i.skipGitErrors {
+				continue
+			}
+
+			return err
+		}
+
+		if ignored {
 			continue
 		}
 
@@ -876,7 +890,16 @@ func (i *squashRemoteRefsIter) Advance() error {
 			}
 		}
 
-		if ref.Type() != plumbing.HashReference {
+		ignored, err := isIgnoredReference(i.Repository().Repository, ref)
+		if err != nil {
+			if i.skipGitErrors {
+				continue
+			}
+
+			return err
+		}
+
+		if ignored {
 			continue
 		}