mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-01-15 13:17:53 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(git): more robust worktree identification

Browse source 
resolves #5343
This commit is contained in:
Jan De Dobbeleer 2024-07-26 10:58:56 +02:00 committed by Jan De Dobbeleer
parent 7273dba124
commit 3fddcac9bf
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/segments/git.go
View file

@ -332,6 +332,7 @@ func (g *Git) getBareRepoInfo() {
if !g.props.GetBool(FetchUpstreamIcon, false) { if !g.props.GetBool(FetchUpstreamIcon, false) {
return return
} }
g.Upstream = g.getGitCommandOutput("remote") g.Upstream = g.getGitCommandOutput("remote")
if len(g.Upstream) != 0 { if len(g.Upstream) != 0 {
g.UpstreamIcon = g.getUpstreamIcon() g.UpstreamIcon = g.getUpstreamIcon()
@ -353,7 +354,7 @@ func (g *Git) hasWorktree(gitdir *runtime.FileInfo) bool {
content = strings.Trim(content, " \r\n") content = strings.Trim(content, " \r\n")
matches := regex.FindNamedRegexMatch(`^gitdir: (?P<dir>.*)$`, content) matches := regex.FindNamedRegexMatch(`^gitdir: (?P<dir>.*)$`, content)
if matches == nil || len(matches["dir"]) == 0 { if len(matches) == 0 {
g.env.Debug("no matches found, directory isn't a worktree") g.env.Debug("no matches found, directory isn't a worktree")
return false return false
} }
@ -362,22 +363,25 @@ func (g *Git) hasWorktree(gitdir *runtime.FileInfo) bool {
// to the mounted path // to the mounted path
g.workingDir = g.convertToLinuxPath(matches["dir"]) g.workingDir = g.convertToLinuxPath(matches["dir"])
// if we don't do this, we will identify the submodule as a worktree
isSubmodule := strings.Contains(g.workingDir, "/modules/")
// 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 // rootDir needs to become path/.git
// :ind+5 = index + /.git // realDir needs to become path
ind := strings.LastIndex(g.workingDir, ".git/worktrees") ind := strings.LastIndex(g.workingDir, "/worktrees/")
if ind > -1 { if ind > -1 && !isSubmodule {
gitDir := filepath.Join(g.workingDir, "gitdir") gitDir := filepath.Join(g.workingDir, "gitdir")
g.rootDir = g.workingDir[:ind+4] g.rootDir = g.workingDir[:ind]
g.realDir = strings.TrimSuffix(g.env.FileContent(gitDir), ".git\n") gitDirContent := g.env.FileContent(gitDir)
g.realDir = strings.TrimSuffix(gitDirContent, ".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") if isSubmodule {
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
// this: path/.git/modules/module/path/worktrees/location. We cannot distinguish // this: path/.git/modules/module/path/worktrees/location. We cannot distinguish
@ -392,6 +396,7 @@ func (g *Git) hasWorktree(gitdir *runtime.FileInfo) bool {
g.IsWorkTree = true g.IsWorkTree = true
return true return true
} }
g.realDir = g.rootDir g.realDir = g.rootDir
g.workingDir = g.rootDir g.workingDir = g.rootDir
return true return true