Skip to content

Commit

Permalink
Fix gitfs tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jonjohnsonjr committed Sep 30, 2024
1 parent 0af44fa commit b8ca959
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
15 changes: 7 additions & 8 deletions internal/forks/rsc.io/gitfs/fs.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
hashpkg "hash"
"io"
"io/fs"
"log"
"runtime/debug"
"strings"
"time"
Expand Down Expand Up @@ -249,14 +248,14 @@ func (t *treeFS) Open(name string) (f fs.File, err error) {
}
}()

prefix := t.s.repo.root + "@" + t.commit.String()
log.Printf("name=%q, prefix=%q", name, prefix)
name = strings.TrimPrefix(name, prefix)
name = strings.TrimPrefix(name, "/")
if name == "" {
name = "."
if t.s.repo != nil {
prefix := t.s.repo.root + "@" + t.commit.String()
name = strings.TrimPrefix(name, prefix)
name = strings.TrimPrefix(name, "/")
if name == "" {
name = "."
}
}
log.Printf("cleaned=%q", name)

// Process each element in the slash-separated path, producing hash identified by name.
h := t.tree
Expand Down
6 changes: 3 additions & 3 deletions internal/forks/rsc.io/gitfs/git_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func TestGerrit(t *testing.T) {
if err != nil {
t.Fatal(err)
}
_, fsys, err := r.Clone("HEAD")
_, fsys, err := r.Clone(context.Background(), "HEAD")
if err != nil {
t.Fatal(err)
}
Expand All @@ -38,7 +38,7 @@ func TestGitHub(t *testing.T) {
if err != nil {
t.Fatal(err)
}
_, fsys, err := r.Clone("HEAD")
_, fsys, err := r.Clone(context.Background(), "HEAD")
if err != nil {
t.Fatal(err)
}
Expand All @@ -61,7 +61,7 @@ func TestPack(t *testing.T) {
}

h := Hash{0xf6, 0xf7, 0x39, 0x2a, 0x99, 0x9b, 0x3d, 0x75, 0xe2, 0x1c, 0xae, 0xe3, 0x3a, 0xeb, 0x6d, 0x01, 0x92, 0xe8, 0xdc, 0x6b}
tfs, err := s.Commit(h)
tfs, _, err := s.Commit(h)
if err != nil {
t.Fatal(err)
}
Expand Down

0 comments on commit b8ca959

Please sign in to comment.