Fix GET / is 404 when non-git repository exists in scanPath https://tangled.org/pocka.jp/legit/issues/20 Regression introduced in e31c3f8f4e4271038ef02560da68c6154b2e6121

Changes

2 changed files (+104/-2)

• routes/serveindex.go
  • @@ -24,8 +24,11 @@ func (d *deps) serveIndex(w http.ResponseWriter, r *http.Request) {
    gr, name, err := d.openRepository(dir.Name(), "") if err != nil { - d.write404(w) - return + // This can be user having non-repository directory inside repo.scanPath. + // In that case, logging an error would flood log output. + // This makes debugging "repository not visible on top page" more difficult, + // but is safer and steadier. + continue } if d.isIgnored(name) || d.isUnlisted(name) {
• routes/serveindex_test.go (new)
  • @@ -0,0 +1,99 @@
    + // Copyright 2026 Shota FUJI <pockawoooh@gmail.com> + // SPDX-License-Identifier: MIT + + package routes + + import ( + "io" + "net/http" + "net/http/httptest" + "net/url" + "os" + "path/filepath" + "strings" + "testing" + + "github.com/go-git/go-git/v5" + "github.com/pocka/legit/config" + "github.com/pocka/legit/embed" + "github.com/pocka/legit/tests" + ) + + func TestServeIndexIgnoreNonGitRepos(t *testing.T) { + repos := t.TempDir() + + // Normal repository + { + _, worktree, err := tests.CreateRepository(repos, "foo") + if err != nil { + t.Fatal(err) + } + + readme, err := worktree.Filesystem.Create("README.md") + if err != nil { + t.Fatal(err) + } + + if _, err := readme.Write([]byte("* iawsoiwjfngbhfg812uhjikwe6789asfd")); err != nil { + t.Fatal(err) + } + + _ = readme.Close() + + if _, err := worktree.Add("README.md"); err != nil { + t.Fatal(err) + } + + _, err = worktree.Commit("Add README", &git.CommitOptions{ + Author: tests.SignatureAlice(), + }) + if err != nil { + t.Fatalf("Unable to commit: %s", err) + } + } + + // Non git directory + { + if err := os.Mkdir(filepath.Join(repos, "bar"), 0o777); err != nil { + t.Fatal(err) + } + } + + var c config.Config + c.Repo.ScanPath = repos + c.Repo.Readme = []string{"README.md"} + c.Repo.MainBranch = []string{"trunk"} + + scanRoot, err := os.OpenRoot(repos) + if err != nil { + t.Fatal(err) + } + defer scanRoot.Close() + + server := httptest.NewServer(Handler(&c, scanRoot, embed.StaticDir(), embed.TemplatesDir())) + defer server.Close() + + target, err := url.JoinPath(server.URL, "/") + if err != nil { + t.Fatal(err) + } + + res, err := http.Get(target) + if err != nil { + t.Fatal(err) + } + + if res.StatusCode != 200 { + t.Fatalf("Expected HTTP 200, Got %d", res.StatusCode) + } + + body, err := io.ReadAll(res.Body) + res.Body.Close() + if err != nil { + t.Fatal(err) + } + + if !strings.Contains(string(body), "foo") { + t.Error("Body not containing magic string") + } + }