feat(git): add git branch to CacheKey

resolves #6012
JanDeDobbeleer · Dec 17, 2024 · 962e2ea · 962e2ea
1 parent a7ad857
commit 962e2ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/config/segment.go b/src/config/segment.go
@@ -223,9 +223,10 @@ func (segment *Segment) restoreCache() bool {
 		return false
 	}
 
-	data, OK := segment.env.Session().Get(segment.cacheKey())
+	cacheKey := segment.cacheKey()
+	data, OK := segment.env.Session().Get(cacheKey)
 	if !OK {
-		log.Debug("no cache found for segment: ", segment.Name())
+		log.Debugf("no cache found for segment: %s, key: %s", segment.Name(), cacheKey)
 		return false
 	}
 

diff --git a/src/segments/git.go b/src/segments/git.go
@@ -217,7 +217,9 @@ func (g *Git) CacheKey() (string, bool) {
 		return "", false
 	}
 
-	return dir.Path, true
+	ref := g.FileContents(dir.Path, "HEAD")
+	ref = strings.Replace(ref, "ref: refs/heads/", "", 1)
+	return fmt.Sprintf("%s@%s", dir.Path, ref), true
 }
 
 func (g *Git) Commit() *Commit {