Skip to content
Merged
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
private readonly ITaggedSemanticVersionService taggedSemanticVersionService = taggedSemanticVersionService.NotNull();
private readonly IRepositoryStore repositoryStore = repositoryStore.NotNull();
private readonly IIncrementStrategyFinder incrementStrategyFinder = incrementStrategyFinder.NotNull();
private readonly Dictionary<string, Dictionary<ICommit, List<(IBranch, IBranchConfiguration)>>> commitsWasBranchedFromCache = new();

private GitVersionContext Context => contextLazy.Value;

Expand Down Expand Up @@ -277,6 +278,15 @@
private Dictionary<ICommit, List<(IBranch, IBranchConfiguration)>> GetCommitsWasBranchedFrom(
IBranch branch, params IBranch[] excludedBranches)
{
// Create cache key from canonical branch name and canonical excluded branch names
var cacheKey = $"{branch.Name.Canonical}|{string.Join(",", excludedBranches.Select(b => b.Name.Canonical).OrderBy(n => n))}";

// Return cached result if available
if (this.commitsWasBranchedFromCache.TryGetValue(cacheKey, out var cachedResult))
{
return cachedResult;
}

Dictionary<ICommit, List<(IBranch, IBranchConfiguration Configuration)>> result = [];

var branchCommits = repositoryStore.FindCommitBranchesBranchedFrom(
Expand All @@ -298,8 +308,9 @@
throw new InvalidOperationException();
}

if ((branchConfiguration.IsMainBranch ?? Context.Configuration.IsMainBranch) != true) continue;
foreach (var _ in value.ToArray())
// Fix: Just add the item once instead of duplicating for each existing item
// The original logic caused exponential growth: 1→2→4→8→16 with multiple branches
if (branchConfiguration.IsMainBranch ?? Context.Configuration.IsMainBranch)

Check failure on line 313 in src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs

View workflow job for this annotation

GitHub Actions / DotNet Format

Cannot implicitly convert type 'bool?' to 'bool'. An explicit conversion exists (are you missing a cast?)

Check failure on line 313 in src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs

View workflow job for this annotation

GitHub Actions / DotNet Format

Cannot implicitly convert type 'bool?' to 'bool'. An explicit conversion exists (are you missing a cast?)

Check failure on line 313 in src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs

View workflow job for this annotation

GitHub Actions / DotNet Format

Cannot implicitly convert type 'bool?' to 'bool'. An explicit conversion exists (are you missing a cast?)

Check failure on line 313 in src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs

View workflow job for this annotation

GitHub Actions / Prepare / macos-15

Cannot implicitly convert type 'bool?' to 'bool'. An explicit conversion exists (are you missing a cast?)

Check failure on line 313 in src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs

View workflow job for this annotation

GitHub Actions / Prepare / macos-15

Cannot implicitly convert type 'bool?' to 'bool'. An explicit conversion exists (are you missing a cast?)

Check failure on line 313 in src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs

View workflow job for this annotation

GitHub Actions / Prepare / windows-2025

Cannot implicitly convert type 'bool?' to 'bool'. An explicit conversion exists (are you missing a cast?)

Check failure on line 313 in src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs

View workflow job for this annotation

GitHub Actions / Prepare / windows-2025

Cannot implicitly convert type 'bool?' to 'bool'. An explicit conversion exists (are you missing a cast?)

Check failure on line 313 in src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Cannot implicitly convert type 'bool?' to 'bool'. An explicit conversion exists (are you missing a cast?)

Check failure on line 313 in src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs

View workflow job for this annotation

GitHub Actions / Analyze (csharp)

Cannot implicitly convert type 'bool?' to 'bool'. An explicit conversion exists (are you missing a cast?)

Check failure on line 313 in src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs

View workflow job for this annotation

GitHub Actions / Prepare / ubuntu-24.04

Cannot implicitly convert type 'bool?' to 'bool'. An explicit conversion exists (are you missing a cast?)

Check failure on line 313 in src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/MainlineVersionStrategy.cs

View workflow job for this annotation

GitHub Actions / Prepare / ubuntu-24.04

Cannot implicitly convert type 'bool?' to 'bool'. An explicit conversion exists (are you missing a cast?)
{
value.Add(new(item, branchConfiguration));
}
Expand All @@ -315,6 +326,10 @@
{
result[item.Key] = [.. item.Value.OrderByDescending(element => (element.Configuration.IsMainBranch ?? Context.Configuration.IsMainBranch) == true)];
}

// Cache the result for future calls
this.commitsWasBranchedFromCache[cacheKey] = result;

return result;
}

Expand Down
Loading