gitbase: ignore references not pointing to commit objects

Signed-off-by: Miguel Molina <[email protected]>

Author: erizocosmico

commits.go

@@ -215,45 +215,51 @@ func newCommitIter(
 	}, nil
 }
 
-func (i *commitIter) loadNextRef() (skip bool, err error) {
-	if i.refs == nil {
-		return false, io.EOF
-	}
+func (i *commitIter) loadNextRef() (err error) {
+	for {
+		if i.refs == nil {
+			return io.EOF
+		}
 
-	i.ref, err = i.refs.Next()
-	if err != nil {
-		if err == io.EOF {
-			return false, io.EOF
+		i.ref, err = i.refs.Next()
+		if err != nil {
+			if err != io.EOF && i.skipGitErrors {
+				continue
+			}
+
+			return err
 		}
 
-		if i.skipGitErrors {
-			return true, nil
+		if i.ref.Type() != plumbing.HashReference {
+			i.ref = nil
+			continue
 		}
 
-		return false, err
-	}
+		obj, err := i.repo.Object(plumbing.AnyObject, i.ref.Hash())
+		if err != nil {
+			if i.skipGitErrors {
+				continue
+			}
 
-	if i.ref.Type() != plumbing.HashReference {
-		i.ref = nil
-		return true, nil
-	}
+			return err
+		}
+
+		if obj.Type() != plumbing.CommitObject {
+			continue
+		}
 
-	i.queue = append(i.queue, i.ref.Hash())
+		i.queue = append(i.queue, i.ref.Hash())
 
-	return false, nil
+		return nil
+	}
 }
 
 func (i *commitIter) Next() (*object.Commit, error) {
 	for {
 		if i.ref == nil {
-			skip, err := i.loadNextRef()
-			if err != nil {
+			if err := i.loadNextRef(); err != nil {
 				return nil, err
 			}
-
-			if skip {
-				continue
-			}
 		}
 
 		if len(i.queue) == 0 {

integration_test.go

@@ -329,6 +329,23 @@ func TestIntegration(t *testing.T) {
 				{"Ignore List", int32(1)},
 			},
 		},
+		{
+			`
+			SELECT 
+				repository_id,
+				contributor_count 
+			FROM (
+				SELECT 
+					repository_id, 
+					COUNT(DISTINCT commit_author_email) AS contributor_count 
+				FROM commits 
+				GROUP BY repository_id
+			) AS q 
+			ORDER BY contributor_count DESC 
+			LIMIT 10
+			`,
+			[]sql.Row{{"worktree", int32(9)}},
+		},
 	}
 
 	runTests := func(t *testing.T) {