mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-03-05 20:49:04 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(git): strip correct directory part when in worktree

Browse source
This commit is contained in:
Jan De Dobbeleer 2023-09-29 09:21:00 +02:00 committed by Jan De Dobbeleer
parent 19020c10bb
commit 5f5c0c0e9b
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/segments/git.go
View file

@ -332,11 +332,15 @@ func (g *Git) setDir(dir string) {
func (g *Git) hasWorktree(gitdir *platform.FileInfo) bool { func (g *Git) hasWorktree(gitdir *platform.FileInfo) bool {
g.rootDir = gitdir.Path g.rootDir = gitdir.Path
dirPointer := strings.Trim(g.env.FileContent(gitdir.Path), " \r\n") content := g.env.FileContent(gitdir.Path)
matches := regex.FindNamedRegexMatch(`^gitdir: (?P<dir>.*)$`, dirPointer) content = strings.Trim(content, " \r\n")
if matches == nil || matches["dir"] == "" { matches := regex.FindNamedRegexMatch(`^gitdir: (?P<dir>.*)$`, content)
if matches == nil || len(matches["dir"]) == 0 {
g.env.Debug("No matches found, directory isn't a worktree")
return false return false
} }
// if we open a worktree file in a WSL shared folder, we have to convert it back // if we open a worktree file in a WSL shared folder, we have to convert it back
// to the mounted path // to the mounted path
g.workingDir = g.convertToLinuxPath(matches["dir"]) g.workingDir = g.convertToLinuxPath(matches["dir"])
@ -344,17 +348,18 @@ func (g *Git) hasWorktree(gitdir *platform.FileInfo) bool {
// in worktrees, the path looks like this: gitdir: path/.git/worktrees/branch // in worktrees, the path looks like this: gitdir: path/.git/worktrees/branch
// strips the last .git/worktrees part // strips the last .git/worktrees part
// :ind+5 = index + /.git // :ind+5 = index + /.git
ind := strings.LastIndex(g.workingDir, "/.git/worktrees") ind := strings.LastIndex(g.workingDir, ".git/worktrees")
if ind > -1 { if ind > -1 {
gitDir := filepath.Join(g.workingDir, "gitdir") gitDir := filepath.Join(g.workingDir, "gitdir")
g.rootDir = g.workingDir[:ind+5] g.rootDir = g.workingDir[:ind+4]
g.realDir = strings.TrimSuffix(g.env.FileContent(gitDir), ".git\n") g.realDir = strings.TrimSuffix(g.env.FileContent(gitDir), ".git\n")
g.IsWorkTree = true g.IsWorkTree = true
return true return true
} }
// in submodules, the path looks like this: gitdir: ../.git/modules/test-submodule // in submodules, the path looks like this: gitdir: ../.git/modules/test-submodule
// we need the parent folder to detect where the real .git folder is // we need the parent folder to detect where the real .git folder is
ind = strings.LastIndex(g.workingDir, "/.git/modules") ind = strings.LastIndex(g.workingDir, ".git/modules")
if ind > -1 { if ind > -1 {
g.rootDir = resolveGitPath(gitdir.ParentFolder, g.workingDir) g.rootDir = resolveGitPath(gitdir.ParentFolder, g.workingDir)
// this might be both a worktree and a submodule, where the path would look like // this might be both a worktree and a submodule, where the path would look like
@ -384,6 +389,7 @@ func (g *Git) hasWorktree(gitdir *platform.FileInfo) bool {
g.realDir = gitFolder g.realDir = gitFolder
return true return true
} }
return false return false
} }