WIP

Author: Pascal van Buijtene

src/GitVersion.LibGit2Sharp/Git/GitCache.cs

@@ -10,18 +10,21 @@ internal sealed class GitCache
     private static readonly ConcurrentDictionary<string, Remote> cachedRemotes = new();
     private static readonly ConcurrentDictionary<string, Tag> cachedTags = new();
 
-    public Branch GetOrCreate(LibGit2Sharp.Branch innerBranch, LibGit2Sharp.Diff repoDiff) =>
-        cachedBranches.GetOrAdd(Guid.NewGuid().ToString(), new Branch(innerBranch, repoDiff, this));
+    public Branch GetOrCreate(LibGit2Sharp.Branch innerBranch, LibGit2Sharp.Diff repoDiff) {
+        if (innerBranch.Tip is null)
+        {
+            return new Branch(innerBranch, repoDiff, this);
+        }
+        return cachedBranches.GetOrAdd($"{innerBranch.CanonicalName}|{innerBranch.Tip.Sha}|{innerBranch.RemoteName}", new Branch(innerBranch, repoDiff, this));
+    }
 
     public Commit GetOrCreate(LibGit2Sharp.Commit innerCommit, LibGit2Sharp.Diff repoDiff) =>
         cachedCommits.GetOrAdd(innerCommit.Sha, new Commit(innerCommit, repoDiff, this));
 
-    public Reference GetOrCreate(LibGit2Sharp.Reference innerReference) =>
-        cachedReferences.GetOrAdd(innerReference.CanonicalName, new Reference(innerReference));
+    public Reference GetOrCreate(LibGit2Sharp.Reference innerReference) => new Reference(innerReference);
 
-    public Remote GetOrCreate(LibGit2Sharp.Remote innerRemote) =>
-        cachedRemotes.GetOrAdd(innerRemote.Name, new Remote(innerRemote));
+    public Remote GetOrCreate(LibGit2Sharp.Remote innerRemote) => new Remote(innerRemote);
 
     public Tag GetOrCreate(LibGit2Sharp.Tag innerTag, LibGit2Sharp.Diff repoDiff) =>
-        cachedTags.GetOrAdd(innerTag.CanonicalName, new Tag(innerTag, repoDiff, this));
+        cachedTags.GetOrAdd($"{innerTag.CanonicalName}|{innerTag.Target.Sha}", new Tag(innerTag, repoDiff, this));
 }