lunny/git-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lfs: remove filepath.Join calls

Browse Source
This commit is contained in:
Taylor Blau 2018-02-15 16:33:46 -08:00
parent e8009e1ade
commit fd69029c76
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lfs/util.go
View File

@ -7,6 +7,7 @@ import (
"os"
"path/filepath"
"runtime"
"strings"
"github.com/git-lfs/git-lfs/config"
"github.com/git-lfs/git-lfs/tools"
@ -24,6 +25,10 @@ const (
var currentPlatform = PlatformUndetermined
func join(parts ...string) string {
return strings.Join(parts, "/")
}
func (f *GitFilter) CopyCallbackFile(event, filename string, index, totalFiles int) (tools.CopyCallback, *os.File, error) {
logPath, _ := f.cfg.Os.Get("GIT_LFS_PROGRESS")
if len(logPath) == 0 || len(filename) == 0 || len(event) == 0 {
@ -118,7 +123,7 @@ func (p *repoToCurrentPathConverter) Convert(filename string) string {
return filename
}
abs := filepath.Join(p.repoDir, filename)
abs := join(p.repoDir, filename)
rel, err := filepath.Rel(p.currDir, abs)
if err != nil {
// Use absolute file instead
@ -160,7 +165,7 @@ func (p *currentToRepoPathConverter) Convert(filename string) string {
if filepath.IsAbs(filename) {
abs = tools.ResolveSymlinks(filename)
} else {
abs = filepath.Join(p.currDir, filename)
abs = join(p.currDir, filename)
}
reltoroot, err := filepath.Rel(p.repoDir, abs)
if err != nil {