mirror of
				https://github.com/go-gitea/gitea
				synced 2025-11-03 21:08:25 +00:00 
			
		
		
		
	Use filepath.Join instead of path.Join for file system file operations (#33978)
This commit is contained in:
		@@ -8,7 +8,7 @@ import (
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"os"
 | 
			
		||||
	"os/exec"
 | 
			
		||||
	"path"
 | 
			
		||||
	"path/filepath"
 | 
			
		||||
	"strings"
 | 
			
		||||
 | 
			
		||||
	"code.gitea.io/gitea/models"
 | 
			
		||||
@@ -148,7 +148,7 @@ func checkDaemonExport(ctx context.Context, logger log.Logger, autofix bool) err
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		// Create/Remove git-daemon-export-ok for git-daemon...
 | 
			
		||||
		daemonExportFile := path.Join(repo.RepoPath(), `git-daemon-export-ok`)
 | 
			
		||||
		daemonExportFile := filepath.Join(repo.RepoPath(), `git-daemon-export-ok`)
 | 
			
		||||
		isExist, err := util.IsExist(daemonExportFile)
 | 
			
		||||
		if err != nil {
 | 
			
		||||
			log.Error("Unable to check if %s exists. Error: %v", daemonExportFile, err)
 | 
			
		||||
@@ -196,7 +196,7 @@ func checkCommitGraph(ctx context.Context, logger log.Logger, autofix bool) erro
 | 
			
		||||
 | 
			
		||||
		commitGraphExists := func() (bool, error) {
 | 
			
		||||
			// Check commit-graph exists
 | 
			
		||||
			commitGraphFile := path.Join(repo.RepoPath(), `objects/info/commit-graph`)
 | 
			
		||||
			commitGraphFile := filepath.Join(repo.RepoPath(), `objects/info/commit-graph`)
 | 
			
		||||
			isExist, err := util.IsExist(commitGraphFile)
 | 
			
		||||
			if err != nil {
 | 
			
		||||
				logger.Error("Unable to check if %s exists. Error: %v", commitGraphFile, err)
 | 
			
		||||
@@ -204,7 +204,7 @@ func checkCommitGraph(ctx context.Context, logger log.Logger, autofix bool) erro
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
			if !isExist {
 | 
			
		||||
				commitGraphsDir := path.Join(repo.RepoPath(), `objects/info/commit-graphs`)
 | 
			
		||||
				commitGraphsDir := filepath.Join(repo.RepoPath(), `objects/info/commit-graphs`)
 | 
			
		||||
				isExist, err = util.IsExist(commitGraphsDir)
 | 
			
		||||
				if err != nil {
 | 
			
		||||
					logger.Error("Unable to check if %s exists. Error: %v", commitGraphsDir, err)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user