Return root tree from each commit

Signed-off-by: Javi Fontan <[email protected]>

Author: jfontan

commit_trees.go

@@ -104,7 +104,6 @@ type commitTreesIter struct {
 	commits object.CommitIter
 	commit  *object.Commit
 	trees   *object.TreeWalker
-	seen    map[plumbing.Hash]bool
 
 	// selectors for faster filtering
 	repos        []string
@@ -141,6 +140,7 @@ func (i *commitTreesIter) Next() (sql.Row, error) {
 			return nil, io.EOF
 		}
 
+		var tree *object.Tree
 		if i.trees == nil {
 			commit, err := i.commits.Next()
 			if err != nil {
@@ -156,7 +156,7 @@ func (i *commitTreesIter) Next() (sql.Row, error) {
 				return nil, err
 			}
 
-			tree, err := commit.Tree()
+			tree, err = commit.Tree()
 			if err != nil {
 				if s.SkipGitErrors {
 					continue
@@ -165,11 +165,18 @@ func (i *commitTreesIter) Next() (sql.Row, error) {
 				return nil, err
 			}
 
-			i.seen = make(map[plumbing.Hash]bool)
-			i.trees = object.NewTreeWalker(tree, true, i.seen)
+			i.trees = object.NewTreeWalker(tree, true, make(map[plumbing.Hash]bool))
 			i.commit = commit
 		}
 
+		if tree != nil {
+			return sql.NewRow(
+				i.repo.ID,
+				i.commit.Hash.String(),
+				tree.Hash.String(),
+			), nil
+		}
+
 		_, entry, err := i.trees.Next()
 		if err != nil {
 			i.trees.Close()
@@ -192,7 +199,6 @@ func (i *commitTreesIter) Next() (sql.Row, error) {
 			entry.Hash.String(),
 		), nil
 	}
-	return nil, nil
 }
 
 func (i *commitTreesIter) Close() error {

commit_trees_test.go

@@ -25,20 +25,30 @@ func TestCommitTreesRowIter(t *testing.T) {
 	}
 
 	expected := []sql.Row{
+		{"e8d3ffab552895c19b9fcf7aa264d277cde33881", "dbd3641b371024f44d0e469a9c8f5457b0660de1"},
 		{"e8d3ffab552895c19b9fcf7aa264d277cde33881", "a39771a7651f97faf5c72e08224d857fc35133db"},
 		{"e8d3ffab552895c19b9fcf7aa264d277cde33881", "5a877e6a906a2743ad6e45d99c1793642aaf8eda"},
 		{"e8d3ffab552895c19b9fcf7aa264d277cde33881", "586af567d0bb5e771e49bdd9434f5e0fb76d25fa"},
 
+		{"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "a8d315b2b1c615d43042c3a62402b8a54288cf5c"},
 		{"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "a39771a7651f97faf5c72e08224d857fc35133db"},
 		{"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "5a877e6a906a2743ad6e45d99c1793642aaf8eda"},
 		{"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "586af567d0bb5e771e49bdd9434f5e0fb76d25fa"},
 		{"6ecf0ef2c2dffb796033e5a02219af86ec6584e5", "cf4aa3b38974fb7d81f367c0830f7d78d65ab86b"},
 
+		{"918c48b83bd081e863dbe1b80f8998f058cd8294", "fb72698cab7617ac416264415f13224dfd7a165e"},
 		{"918c48b83bd081e863dbe1b80f8998f058cd8294", "a39771a7651f97faf5c72e08224d857fc35133db"},
 		{"918c48b83bd081e863dbe1b80f8998f058cd8294", "5a877e6a906a2743ad6e45d99c1793642aaf8eda"},
 		{"918c48b83bd081e863dbe1b80f8998f058cd8294", "586af567d0bb5e771e49bdd9434f5e0fb76d25fa"},
 
+		{"af2d6a6954d532f8ffb47615169c8fdf9d383a1a", "4d081c50e250fa32ea8b1313cf8bb7c2ad7627fd"},
 		{"af2d6a6954d532f8ffb47615169c8fdf9d383a1a", "5a877e6a906a2743ad6e45d99c1793642aaf8eda"},
+
+		{"1669dce138d9b841a518c64b10914d88f5e488ea", "eba74343e2f15d62adedfd8c883ee0262b5c8021"},
+		{"a5b8b09e2f8fcb0bb99d3ccb0958157b40890d69", "c2d30fa8ef288618f65f6eed6e168e0d514886f4"},
+		{"b8e471f58bcbca63b07bda20e428190409c2db47", "c2d30fa8ef288618f65f6eed6e168e0d514886f4"},
+		{"35e85108805c84807bc66a02d91535e1e24b38b9", "8dcef98b1d52143e1e2dbc458ffe38f925786bf2"},
+		{"b029517f6300c2da0f4b651b8642506cd6aaf45d", "aa9b383c260e1d05fbbf6b30a02914555e20c725"},
 	}
 
 	require.Equal(expected, rows)
@@ -63,6 +73,7 @@ func TestCommitTreesPushdown(t *testing.T) {
 				),
 			},
 			[]sql.Row{
+				{"918c48b83bd081e863dbe1b80f8998f058cd8294", "fb72698cab7617ac416264415f13224dfd7a165e"},
 				{"918c48b83bd081e863dbe1b80f8998f058cd8294", "a39771a7651f97faf5c72e08224d857fc35133db"},
 				{"918c48b83bd081e863dbe1b80f8998f058cd8294", "5a877e6a906a2743ad6e45d99c1793642aaf8eda"},
 				{"918c48b83bd081e863dbe1b80f8998f058cd8294", "586af567d0bb5e771e49bdd9434f5e0fb76d25fa"},