improves branch/tag cache keys

Author: arturcic

src/GitVersion.LibGit2Sharp/Git/GitRepository.cs

@@ -65,23 +65,17 @@ public int UncommittedChangesCount()
 
     public Branch GetOrCreate(LibGit2Sharp.Branch innerBranch, Diff repoDiff)
     {
-        if (innerBranch.Tip is null)
-        {
-            return new Branch(innerBranch, repoDiff, this);
-        }
-
-        var cacheKey = $"{innerBranch.CanonicalName}|{innerBranch.Tip.Sha}|{innerBranch.RemoteName}";
-        return cachedBranches.GetOrAdd(cacheKey, new Branch(innerBranch, repoDiff, this));
+        var cacheKey = innerBranch.Tip is null
+            ? $"{innerBranch.RemoteName}/{innerBranch.CanonicalName}"
+            : $"{innerBranch.RemoteName}/{innerBranch.CanonicalName}@{innerBranch.Tip.Sha}";
+        return cachedBranches.GetOrAdd(cacheKey, _ => new Branch(innerBranch, repoDiff, this));
     }
 
-    public Commit GetOrCreate(LibGit2Sharp.Commit innerCommit, Diff repoDiff) =>
-        cachedCommits.GetOrAdd(innerCommit.Sha, new Commit(innerCommit, repoDiff, this));
+    public Commit GetOrCreate(LibGit2Sharp.Commit innerCommit, Diff repoDiff)
+        => cachedCommits.GetOrAdd(innerCommit.Sha, _ => new Commit(innerCommit, repoDiff, this));
 
     public Tag GetOrCreate(LibGit2Sharp.Tag innerTag, Diff repoDiff)
-    {
-        var cacheKey = $"{innerTag.CanonicalName}|{innerTag.Target.Sha}";
-        return cachedTags.GetOrAdd(cacheKey, new Tag(innerTag, repoDiff, this));
-    }
+        => cachedTags.GetOrAdd(innerTag.CanonicalName, _ => new Tag(innerTag, repoDiff, this));
 
     public void Dispose()
     {