Merge branch 'master' into fix/oniguruma-not-default

Author: ajnavarro

commit_trees.go

@@ -330,11 +330,13 @@ func (i *commitTreesRowIter) Close() error {
 		i.trees.Close()
 	}
 
+	if i.repo != nil {
+		i.repo.Close()
+	}
+
 	if i.index != nil {
 		return i.index.Close()
 	}
 
-	i.repo.Close()
-
 	return nil
 }

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) {

partition.go

@@ -227,5 +227,8 @@ func (i *partitionedIndexKeyValueIter) Next() (sql.Partition, sql.IndexKeyValueI
 }
 
 func (i *partitionedIndexKeyValueIter) Close() error {
-	return i.partitions.Close()
+	if i.partitions != nil {
+		return i.partitions.Close()
+	}
+	return nil
 }

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 {
@@ -361,12 +370,14 @@ func (i *refCommitsRowIter) Close() error {
 		i.refs.Close()
 	}
 
+	if i.repo != nil {
+		i.repo.Close()
+	}
+
 	if i.index != nil {
 		return i.index.Close()
 	}
 
-	i.repo.Close()
-
 	return nil
 }
 
@@ -443,3 +454,9 @@ func (i *indexedCommitIter) Next() (*object.Commit, int, error) {
 		return c, frame.idx, nil
 	}
 }
+
+func (i *indexedCommitIter) Close() {
+	if i.repo != nil {
+		i.repo.Close()
+	}
+}

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
 		}
 
@@ -320,12 +330,14 @@ func (i *refRowIter) Close() error {
 		i.iter.Close()
 	}
 
+	if i.repo != nil {
+		i.repo.Close()
+	}
+
 	if i.index != nil {
 		return i.index.Close()
 	}
 
-	i.repo.Close()
-
 	return nil
 }
 
@@ -338,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
+}

repositories.go

@@ -151,5 +151,8 @@ func (i *repositoriesRowIter) Next() (sql.Row, error) {
 
 func (i *repositoriesRowIter) Close() error {
 	i.visited = true
+	if i.repo != nil {
+		i.repo.Close()
+	}
 	return nil
 }