fix usage of OS-paths vs Git-paths (#23)

petar · web-flow · commit 1f0cca9cd2df · 2023-10-19T10:01:12.000-07:00
diff --git a/git/git.go b/git/git.go
@@ -3,7 +3,7 @@ package git
 import (
 	"context"
 	"fmt"
-	"path/filepath"
+	"strings"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
@@ -26,7 +26,7 @@ func (b Branch) ReferenceName() plumbing.ReferenceName {
 }
 
 func (b Branch) Sub(s string) Branch {
-	return Branch(filepath.Join(string(b), s))
+	return Branch(strings.Join([]string{string(b), s}, "/"))
 }
 
 type CommitHash string
@@ -50,7 +50,7 @@ func (a Address) Sub(s string) Address {
 }
 
 func (a Address) Join(s ns.NS) Address {
-	return Address{Repo: a.Repo, Branch: a.Branch.Sub(s.Path())}
+	return Address{Repo: a.Repo, Branch: a.Branch.Sub(s.GitPath())}
 }
 
 func (a Address) String() string {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package git`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`	`"fmt"`
`6`		`- "path/filepath"`
	`6`	`+ "strings"`
`7`	`7`
`8`	`8`	`"github.com/go-git/go-git/v5"`
`9`	`9`	`"github.com/go-git/go-git/v5/plumbing"`
`@@ -26,7 +26,7 @@ func (b Branch) ReferenceName() plumbing.ReferenceName {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`func (b Branch) Sub(s string) Branch {`
`29`		`- return Branch(filepath.Join(string(b), s))`
	`29`	`+ return Branch(strings.Join([]string{string(b), s}, "/"))`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`type CommitHash string`
`@@ -50,7 +50,7 @@ func (a Address) Sub(s string) Address {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`func (a Address) Join(s ns.NS) Address {`
`53`		`- return Address{Repo: a.Repo, Branch: a.Branch.Sub(s.Path())}`
	`53`	`+ return Address{Repo: a.Repo, Branch: a.Branch.Sub(s.GitPath())}`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`func (a Address) String() string {`