Return error when importing git submodule.

Author: nasdf

git/git.go

@@ -3,8 +3,10 @@ package git
 
 import (
 	"context"
+	"errors"
 	"io/ioutil"
 	"path"
+	"path/filepath"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
@@ -35,7 +37,9 @@ type importer struct {
 
 // ImportFromFS is a helper to import a git repo from a directory.
 func ImportFromFS(ctx context.Context, dag ipld.DAGService, name, dir string) (cid.Cid, error) {
-	repo, err := git.PlainOpen(dir)
+	dot := filepath.Join(dir, ".git")
+
+	repo, err := git.PlainOpen(dot)
 	if err != nil {
 		return cid.Cid{}, err
 	}
@@ -209,8 +213,11 @@ func (i *importer) AddTree(hash plumbing.Hash) (ipld.Node, error) {
 
 // AddTreeEntry adds the tree entry with the given hash to the dag.
 func (i *importer) AddTreeEntry(entry object.TreeEntry) (ipld.Node, error) {
-	if entry.Mode == filemode.Dir {
+	switch entry.Mode {
+	case filemode.Dir:
 		return i.AddTree(entry.Hash)
+	case filemode.Submodule:
+		return nil, errors.New("submodules not supported")
 	}
 
 	blob, err := i.repo.BlobObject(entry.Hash)

git/git_test.go

@@ -2,8 +2,11 @@ package git
 
 import (
 	"context"
+	"io/ioutil"
+	"os"
 	"testing"
 
+	"github.com/go-git/go-git/v5"
 	"github.com/ipfs/go-merkledag/dagutils"
 	"github.com/multiverse-vcs/go-multiverse/data"
 )
@@ -12,7 +15,7 @@ func TestImportFromURL(t *testing.T) {
 	ctx := context.Background()
 	dag := dagutils.NewMemoryDagService()
 
-	id, err := ImportFromURL(ctx, dag, "go-multiverse", "https://github.com/multiverse-vcs/go-multiverse")
+	id, err := ImportFromURL(ctx, dag, "test", "https://github.com/multiverse-vcs/go-multiverse")
 	if err != nil {
 		t.Fatal("failed to import git repo")
 	}
@@ -22,7 +25,41 @@ func TestImportFromURL(t *testing.T) {
 		t.Fatal("failed to get repo")
 	}
 
-	if repo.Name != "go-multiverse" {
+	if repo.Name != "test" {
 		t.Error("unexpected repo name")
 	}
 }
+
+func TestImportFromFS(t *testing.T) {
+	ctx := context.Background()
+	dag := dagutils.NewMemoryDagService()
+
+	dir, err := ioutil.TempDir("", "*")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(dir)
+
+	opts := git.CloneOptions{
+		URL: "https://github.com/multiverse-vcs/go-multiverse",
+	}
+
+	_, err = git.PlainClone(dir, false, &opts)
+	if err != nil {
+		t.Fatal("failed to clone repo")
+	}
+
+	id, err := ImportFromFS(ctx, dag, "test", dir)
+	if err != nil {
+		t.Fatalf("failed to import git repo %s", err)
+	}
+
+	repo, err := data.GetRepository(ctx, dag, id)
+	if err != nil {
+		t.Fatal("failed to get repo")
+	}
+
+	if repo.Name != "test" {
+		t.Error("unexpected repo name")
+	}
+}