cleanup

Author: arturcic

src/GitVersion.LibGit2Sharp/Git/Commit.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using GitVersion.Helpers;
 
 namespace GitVersion
@@ -11,7 +12,7 @@ internal sealed class Commit : ICommit
 
         private readonly LibGit2Sharp.Commit innerCommit;
 
-        internal Commit(LibGit2Sharp.Commit objectId) => innerCommit = objectId;
+        internal Commit(LibGit2Sharp.Commit innerCommit) => this.innerCommit = innerCommit;
 
         public int CompareTo(ICommit other) => comparerHelper.Compare(this, other);
         public override bool Equals(object obj) => Equals((obj as ICommit)!);
@@ -20,29 +21,14 @@ internal sealed class Commit : ICommit
 
         public static implicit operator LibGit2Sharp.Commit(Commit d) => d.innerCommit;
 
-        public IEnumerable<ICommit?> Parents
-        {
-            get
-            {
-                if (innerCommit == null) yield return null;
-                else
-                    foreach (var parent in innerCommit.Parents)
-                        yield return new Commit(parent);
-            }
-        }
+        public IEnumerable<ICommit> Parents => innerCommit.Parents.Select(parent => new Commit(parent));
 
         public string Sha => innerCommit.Sha;
 
-        public IObjectId? Id
-        {
-            get
-            {
-                var objectId = innerCommit.Id;
-                return objectId is null ? null : new ObjectId(objectId);
-            }
-        }
+        public IObjectId Id => new ObjectId(innerCommit.Id);
 
         public DateTimeOffset When => innerCommit.Committer.When;
+
         public string Message => innerCommit.Message;
     }
 }

src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs

@@ -62,17 +62,17 @@ public GitRepositoryInfo(IOptions<GitVersionOptions> options)
 
         private string? GetDotGitDirectory()
         {
-            var _dotGitDirectory = !string.IsNullOrWhiteSpace(DynamicGitRepositoryPath)
+            var gitDirectory = !string.IsNullOrWhiteSpace(DynamicGitRepositoryPath)
                 ? DynamicGitRepositoryPath
                 : GitRepository.Discover(gitVersionOptions.WorkingDirectory);
 
-            _dotGitDirectory = _dotGitDirectory?.TrimEnd('/', '\\');
-            if (string.IsNullOrEmpty(_dotGitDirectory))
+            gitDirectory = gitDirectory?.TrimEnd('/', '\\');
+            if (string.IsNullOrEmpty(gitDirectory))
                 throw new DirectoryNotFoundException("Cannot find the .git directory");
 
-            return _dotGitDirectory is null ? null : _dotGitDirectory.Contains(Path.Combine(".git", "worktrees"))
-                ? Directory.GetParent(Directory.GetParent(_dotGitDirectory).FullName).FullName
-                : _dotGitDirectory;
+            return gitDirectory is null ? null : gitDirectory.Contains(Path.Combine(".git", "worktrees"))
+                ? Directory.GetParent(Directory.GetParent(gitDirectory).FullName).FullName
+                : gitDirectory;
         }
 
         private string GetProjectRootDirectory()

src/GitVersion.LibGit2Sharp/Git/ReferenceCollection.cs

@@ -25,8 +25,16 @@ public void UpdateTarget(IReference directRef, IObjectId targetId)
         }
 
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-        public IReference this[string name] => new Reference(innerCollection[name]);
-        public IReference Head => this["HEAD"];
+        public IReference? this[string name]
+        {
+            get
+            {
+                var branch = innerCollection[name];
+                return branch is null ? null : new Reference(branch);
+            }
+        }
+
+        public IReference? Head => this["HEAD"];
 
         public IEnumerable<IReference> FromGlob(string pattern)
         {