Merge pull request #2859 from ajsmith27/feature/prevent-remote-being-returned-as-source-branch

Feature/Prevent remote being returned as source branch

Author: asbjornu

src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs

@@ -217,5 +217,21 @@ public void GetBranchesContainingCommitThrowsDirectlyOnNullCommit()
 
             Assert.Throws<ArgumentNullException>(() => gitRepoMetadataProvider.GetBranchesContainingCommit(null));
         }
+
+        [Test]
+        public void FindCommitBranchWasBranchedFromShouldReturnNullIfTheRemoteIsTheOnlySource()
+        {
+            using var fixture = new RemoteRepositoryFixture();
+            fixture.MakeACommit("initial");
+
+            var localRepository = fixture.LocalRepositoryFixture.Repository.ToGitRepository();
+
+            var gitRepoMetadataProvider = new RepositoryStore(this.log, localRepository, this.incrementStrategyFinder);
+
+            var branchedCommit = gitRepoMetadataProvider.FindCommitBranchWasBranchedFrom(localRepository.FindBranch("main"), new Model.Configuration.Config(), Array.Empty<IBranch>());
+
+            Assert.IsNull(branchedCommit.Branch);
+            Assert.IsNull(branchedCommit.Commit);
+        }
     }
 }

src/GitVersion.Core/Core/RepositoryStore.cs

@@ -321,7 +321,7 @@ public BranchCommit FindCommitBranchWasBranchedFrom(IBranch branch, Config confi
                 }
 
                 var possibleBranches = GetMergeCommitsForBranch(branch, configuration, excludedBranches)
-                    .Where(b => !branch.Equals(b.Branch))
+                    .Where(b => !branch.Name.EquivalentTo(b.Branch.Name.WithoutRemote))
                     .ToList();
 
                 if (possibleBranches.Count > 1)