go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-23 00:39:13 +02:00
Code Issues Releases Activity

Fix tests

Browse Source 
Going and fixing up some submodule tests which were broken by bad assumptions with worktree code
This commit is contained in:
Jesse Duffield
2023-07-17 17:29:24 +10:00
parent 7569180cac
commit ca6f9c4155
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/commands/git_commands/worktree.go
View File

@ -126,15 +126,22 @@ func GetCurrentRepoPath() string {
return currentPath()
}
// must be a worktree or bare repo
// either in a submodule, a worktree, or a bare repo
worktreeGitPath, ok := WorktreeGitPath(pwd)
if !ok {
// fallback
return currentPath()
}
// now we just jump up three directories to get the repo name
return filepath.Dir(filepath.Dir(filepath.Dir(worktreeGitPath)))
// confirm whether the next directory up is the 'worktrees' directory
parent := filepath.Dir(worktreeGitPath)
if filepath.Base(parent) != "worktrees" {
// fallback
return currentPath()
}
// now we just jump up two more directories to get the repo name
return filepath.Dir(filepath.Dir(parent))
}
func GetCurrentRepoName() string {
@ -159,10 +166,7 @@ func linkedWortkreePaths() []string {
// ensure the directory exists
_, err := os.Stat(worktreePath)
if err != nil {
if errors.Is(err, fs.ErrNotExist) {
return result
}
log.Fatalln(err.Error())
return result
}
err = filepath.Walk(worktreePath, func(path string, info fs.FileInfo, err error) error {
@ -181,7 +185,7 @@ func linkedWortkreePaths() []string {
return nil
})
if err != nil {
log.Fatalln(err.Error())
return result
}
return result