Replace IGitObject with ICommit and remove IGitObject

Refactors code to use `ICommit` directly, removing the redundant `IGitObject` interface. Updates method signatures and implementations accordingly. Deletes the `GitObject` class and streamlines related methods.

Author: arturcic

src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

@@ -199,8 +199,6 @@ private class MockCommit : ICommit
     {
         public bool Equals(ICommit? other) => throw new NotImplementedException();
         public int CompareTo(ICommit? other) => throw new NotImplementedException();
-        public bool Equals(IGitObject? other) => throw new NotImplementedException();
-        public int CompareTo(IGitObject? other) => throw new NotImplementedException();
         public IObjectId Id => throw new NotImplementedException();
         public string Sha => throw new NotImplementedException();
         public IReadOnlyList<ICommit> Parents => throw new NotImplementedException();

src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs

@@ -22,7 +22,7 @@ public interface IRepositoryStore
 
     IReadOnlyList<ICommit> GetCommitLog(ICommit? baseVersionSource, ICommit currentCommit, IIgnoreConfiguration ignore);
     IReadOnlyList<ICommit> GetCommitsReacheableFromHead(ICommit? headCommit, IIgnoreConfiguration ignore);
-    IReadOnlyList<ICommit> GetCommitsReacheableFrom(IGitObject commit, IBranch branch);
+    IReadOnlyList<ICommit> GetCommitsReacheableFrom(ICommit commit, IBranch branch);
 
     IBranch GetTargetBranch(string? targetBranchName);
     IBranch? FindBranch(ReferenceName branchName);

src/GitVersion.Core/Core/BranchesContainingCommitFinder.cs

@@ -21,7 +21,7 @@ public IEnumerable<IBranch> GetBranchesContainingCommit(ICommit commit, IEnumera
         return InnerGetBranchesContainingCommit(commit, branches, onlyTrackedBranches);
     }
 
-    private IEnumerable<IBranch> InnerGetBranchesContainingCommit(IGitObject commit, IEnumerable<IBranch> branches, bool onlyTrackedBranches)
+    private IEnumerable<IBranch> InnerGetBranchesContainingCommit(ICommit commit, IEnumerable<IBranch> branches, bool onlyTrackedBranches)
     {
         using (log.IndentLog($"Getting branches containing the commit '{commit.Id}'."))
         {
@@ -63,6 +63,6 @@ private IEnumerable<IBranch> InnerGetBranchesContainingCommit(IGitObject commit,
     private static bool IncludeTrackedBranches(IBranch branch, bool includeOnlyTracked)
         => (includeOnlyTracked && branch.IsTracking) || !includeOnlyTracked;
 
-    private static bool BranchTipIsNullOrCommit(IBranch branch, IGitObject commit)
+    private static bool BranchTipIsNullOrCommit(IBranch branch, ICommit commit)
         => branch.Tip == null || branch.Tip.Sha == commit.Sha;
 }

src/GitVersion.Core/Core/RepositoryStore.cs

@@ -231,7 +231,7 @@ public IReadOnlyList<ICommit> GetCommitsReacheableFromHead(ICommit? headCommit,
         return [.. ignore.Filter(commits)];
     }
 
-    public IReadOnlyList<ICommit> GetCommitsReacheableFrom(IGitObject commit, IBranch branch)
+    public IReadOnlyList<ICommit> GetCommitsReacheableFrom(ICommit commit, IBranch branch)
     {
         var filter = new CommitFilter { IncludeReachableFrom = branch };
 

src/GitVersion.Core/Git/ICommit.cs

@@ -1,9 +1,13 @@
 namespace GitVersion.Git;
 
-public interface ICommit : IEquatable<ICommit?>, IComparable<ICommit>, IGitObject
+public interface ICommit : IEquatable<ICommit?>, IComparable<ICommit>
 {
     IReadOnlyList<ICommit> Parents { get; }
 
+    IObjectId Id { get; }
+
+    string Sha { get; }
+
     DateTimeOffset When { get; }
 
     string Message { get; }

src/GitVersion.Core/Git/IGitObject.cs

@@ -28,7 +28,6 @@ GitVersion.Common.IRepositoryStore.FindMergeBase(GitVersion.Git.IBranch? branch,
 GitVersion.Common.IRepositoryStore.FindMergeBase(GitVersion.Git.ICommit! commit, GitVersion.Git.ICommit! mainlineTip) -> GitVersion.Git.ICommit?
 GitVersion.Common.IRepositoryStore.GetBranchesContainingCommit(GitVersion.Git.ICommit! commit, System.Collections.Generic.IEnumerable<GitVersion.Git.IBranch!>? branches = null, bool onlyTrackedBranches = false) -> System.Collections.Generic.IEnumerable<GitVersion.Git.IBranch!>!
 GitVersion.Common.IRepositoryStore.GetCommitLog(GitVersion.Git.ICommit? baseVersionSource, GitVersion.Git.ICommit! currentCommit, GitVersion.Configuration.IIgnoreConfiguration! ignore) -> System.Collections.Generic.IReadOnlyList<GitVersion.Git.ICommit!>!
-GitVersion.Common.IRepositoryStore.GetCommitsReacheableFrom(GitVersion.Git.IGitObject! commit, GitVersion.Git.IBranch! branch) -> System.Collections.Generic.IReadOnlyList<GitVersion.Git.ICommit!>!
 GitVersion.Common.IRepositoryStore.GetCommitsReacheableFromHead(GitVersion.Git.ICommit? headCommit, GitVersion.Configuration.IIgnoreConfiguration! ignore) -> System.Collections.Generic.IReadOnlyList<GitVersion.Git.ICommit!>!
 GitVersion.Common.IRepositoryStore.GetCurrentCommit(GitVersion.Git.IBranch! currentBranch, string? commitId, GitVersion.Configuration.IIgnoreConfiguration! ignore) -> GitVersion.Git.ICommit?
 GitVersion.Common.IRepositoryStore.GetForwardMerge(GitVersion.Git.ICommit? commitToFindCommonBase, GitVersion.Git.ICommit? findMergeBase) -> GitVersion.Git.ICommit?
@@ -227,9 +226,6 @@ GitVersion.Git.ICommit.When.get -> System.DateTimeOffset
 GitVersion.Git.ICommitCollection
 GitVersion.Git.ICommitCollection.GetCommitsPriorTo(System.DateTimeOffset olderThan) -> System.Collections.Generic.IEnumerable<GitVersion.Git.ICommit!>!
 GitVersion.Git.ICommitCollection.QueryBy(GitVersion.Git.CommitFilter! commitFilter) -> System.Collections.Generic.IEnumerable<GitVersion.Git.ICommit!>!
-GitVersion.Git.IGitObject
-GitVersion.Git.IGitObject.Id.get -> GitVersion.Git.IObjectId!
-GitVersion.Git.IGitObject.Sha.get -> string!
 GitVersion.Git.IGitRepository
 GitVersion.Git.IGitRepository.Branches.get -> GitVersion.Git.IBranchCollection!
 GitVersion.Git.IGitRepository.Commits.get -> GitVersion.Git.ICommitCollection!

src/GitVersion.Core/PublicAPI.Shipped.txt

@@ -1 +1,4 @@
 #nullable enable
+GitVersion.Common.IRepositoryStore.GetCommitsReacheableFrom(GitVersion.Git.ICommit! commit, GitVersion.Git.IBranch! branch) -> System.Collections.Generic.IReadOnlyList<GitVersion.Git.ICommit!>!
+GitVersion.Git.ICommit.Id.get -> GitVersion.Git.IObjectId!
+GitVersion.Git.ICommit.Sha.get -> string!

src/GitVersion.Core/PublicAPI.Unshipped.txt

@@ -4,7 +4,7 @@
 
 namespace GitVersion.Git;
 
-internal sealed class Commit : GitObject, ICommit
+internal sealed class Commit : ICommit
 {
     private static readonly ConcurrentDictionary<string, IReadOnlyList<string>> pathsCache = new();
     private static readonly LambdaEqualityHelper<ICommit> equalityHelper = new(x => x.Id);
@@ -14,19 +14,23 @@ internal sealed class Commit : GitObject, ICommit
     private readonly LibGit2Sharp.Commit innerCommit;
     private readonly LibGit2Sharp.Diff repoDiff;
 
-    internal Commit(LibGit2Sharp.Commit innerCommit, LibGit2Sharp.Diff repoDiff, GitRepository repo) : base(innerCommit)
+    internal Commit(LibGit2Sharp.Commit innerCommit, LibGit2Sharp.Diff repoDiff, GitRepository repo)
     {
         repoDiff.NotNull();
         repo.NotNull();
         this.innerCommit = innerCommit.NotNull();
         this.parentsLazy = new(() => innerCommit.Parents.Select(parent => repo.GetOrCreate(parent, repoDiff)).ToList());
+        Id = new ObjectId(innerCommit.Id);
+        Sha = innerCommit.Sha;
         When = innerCommit.Committer.When;
         this.repoDiff = repoDiff;
     }
 
     public int CompareTo(ICommit? other) => comparerHelper.Compare(this, other);
     public bool Equals(ICommit? other) => equalityHelper.Equals(this, other);
     public IReadOnlyList<ICommit> Parents => this.parentsLazy.Value;
+    public IObjectId Id { get; }
+    public string Sha { get; }
     public DateTimeOffset When { get; }
     public string Message => this.innerCommit.Message;
     public IReadOnlyList<string> DiffPaths