Support serving bare repositories (#639)

This allows bare repos in addition to worktree style git repos in detection.

Author: andir

internal/servegit/serve.go

@@ -130,6 +130,33 @@ func (s *Serve) handler() http.Handler {
 	})
 }
 
+// Checks if git thinks the given path is a valid .git folder for a repository
+func isBareRepo(path string) bool {
+	c := exec.Command("git", "--git-dir", path, "rev-parse", "--is-bare-repository")
+	c.Dir = path
+	out, err := c.CombinedOutput()
+
+	if err != nil {
+		return false
+	}
+
+	return string(out) != "false\n"
+}
+
+// Check if git thinks the given path is a proper git checkout
+func isGitRepo(path string) bool {
+	// Executing git rev-parse --git-dir in the root of a worktree returns .git
+	c := exec.Command("git", "rev-parse", "--git-dir")
+	c.Dir = path
+	out, err := c.CombinedOutput()
+
+	if err != nil {
+		return false
+	}
+
+	return string(out) == ".git\n"
+}
+
 // Repos returns a slice of all the git repositories it finds.
 func (s *Serve) Repos() ([]Repo, error) {
 	var repos []Repo
@@ -158,10 +185,11 @@ func (s *Serve) Repos() ([]Repo, error) {
 
 		// Check whether a particular directory is a repository or not.
 		//
-		// A directory which also is a repository (have .git folder inside it)
-		// will contain nil error. If it does, proceed to configure.
-		gitdir := filepath.Join(path, ".git")
-		if fi, err := os.Stat(gitdir); err != nil || !fi.IsDir() {
+		// Valid paths are either bare repositories or git worktrees.
+		isBare := isBareRepo(path)
+		isGit := isGitRepo(path)
+
+		if !isGit && !isBare {
 			s.Debug.Printf("not a repository root: %s", path)
 			return nil
 		}
@@ -182,14 +210,9 @@ func (s *Serve) Repos() ([]Repo, error) {
 
 		// Check whether a repository is a bare repository or not.
 		//
-		// If it yields false, which means it is a non-bare repository,
-		// skip the directory so that it will not recurse to the subdirectories.
-		// If it is a bare repository, proceed to recurse.
-		c := exec.Command("git", "rev-parse", "--is-bare-repository")
-		c.Dir = gitdir
-		out, _ := c.CombinedOutput()
-
-		if string(out) == "false\n" {
+		// Bare repositories shouldn't have any further child
+		// repositories. Only regular git worktrees can have children.
+		if isBare {
 			return filepath.SkipDir
 		}
 

internal/servegit/serve_test.go

@@ -32,7 +32,7 @@ func TestReposHandler(t *testing.T) {
 		repos: []string{"project1", "project2"},
 	}, {
 		name:  "nested",
-		repos: []string{"project1", "project1/subproject", "project2", "dir/project3"},
+		repos: []string{"project1", "project1/subproject", "project2", "dir/project3", "dir/project4.bare"},
 	}}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
@@ -171,6 +171,12 @@ func testReposHandler(t *testing.T, h http.Handler, repos []Repo) {
 	}
 }
 
+func gitInitBare(t *testing.T, path string) {
+	if err := exec.Command("git", "init", "--bare", path).Run(); err != nil {
+		t.Fatal(err)
+	}
+}
+
 func gitInitRepos(t *testing.T, names ...string) string {
 	root, err := os.MkdirTemp("", "")
 	if err != nil {
@@ -184,10 +190,11 @@ func gitInitRepos(t *testing.T, names ...string) string {
 		if err := os.MkdirAll(p, 0755); err != nil {
 			t.Fatal(err)
 		}
-		p = filepath.Join(p, ".git")
-		if err := exec.Command("git", "init", "--bare", p).Run(); err != nil {
-			t.Fatal(err)
+
+		if !strings.HasSuffix(p, ".bare") {
+			p = filepath.Join(p, ".git")
 		}
+		gitInitBare(t, p)
 	}
 
 	return root
@@ -221,6 +228,32 @@ func TestIgnoreGitSubmodules(t *testing.T) {
 	}
 }
 
+func TestIsBareRepo(t *testing.T) {
+	dir, err := os.MkdirTemp("", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { os.RemoveAll(dir) })
+
+	gitInitBare(t, dir)
+
+	if !isBareRepo(dir) {
+		t.Errorf("Path %s it not a bare repository", dir)
+	}
+}
+
+func TestEmptyDirIsNotBareRepo(t *testing.T) {
+	dir, err := os.MkdirTemp("", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Cleanup(func() { os.RemoveAll(dir) })
+
+	if isBareRepo(dir) {
+		t.Errorf("Path %s it falsey detected as a bare repository", dir)
+	}
+}
+
 func testLogger(t *testing.T) *log.Logger {
 	return log.New(testWriter{t}, "testLogger ", log.LstdFlags)
 }