Skip to content

Extend MergeMessageVersionStrategy to support squash commits #3965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Extend MergeMessageVersionStrategy to support squash commits #3965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ...tVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public void ShouldNotAllowIncrementOfVersion()
[TestCase("Merge branch 'Release-v0.2.0'", true, "0.2.0")]
[TestCase("Merge remote-tracking branch 'origin/release/0.8.0' into develop/" + MainBranch, true, "0.8.0")]
[TestCase("Merge remote-tracking branch 'refs/remotes/origin/release/2.0.0'", true, "2.0.0")]
[TestCase("Merge branch 'Releases/0.2.0'", false, "0.2.0")] // Support Squash Commits
public void TakesVersionFromMergeOfReleaseBranch(string message, bool isMergeCommit, string expectedVersion)
{
var parents = GetParents(isMergeCommit);
Expand Down
6 changes: 5 additions & 1 deletion src/GitVersion.Core/MergeMessage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,11 @@ public static bool TryParse(

mergeMessage = null;

if (mergeCommit.IsMergeCommit)
var mergeMessageFormats = DefaultFormats.Union(
configuration.MergeMessageFormats
.Select(n => new MergeMessageFormat(n.Key, n.Value)));

if (mergeCommit.IsMergeCommit || mergeMessageFormats.Any(format => format.Pattern.IsMatch(mergeCommit.Message)))
Copy link
Member

@asbjornu asbjornu Mar 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we expose this as Commit.HasMergeMessage(…) instead?

Suggested change
if (mergeCommit.IsMergeCommit || mergeMessageFormats.Any(format => format.Pattern.IsMatch(mergeCommit.Message)))
if (mergeCommit.IsMergeCommit || mergeCommit.HasMergeMessage(mergeMessageFormats))

{
mergeMessage = new(mergeCommit.Message, configuration);
}
Expand Down
14 changes: 4 additions & 10 deletions ...GitVersion.Core/VersionCalculation/VersionSearchStrategies/MergeMessageVersionStrategy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,8 @@ private static bool TryParse(ICommit mergeCommit, GitVersionContext context, [No
return mergeMessage != null;
}

private static MergeMessage? Inner(ICommit mergeCommit, GitVersionContext context)
{
if (mergeCommit.Parents.Count() < 2)
{
return null;
}

var mergeMessage = new MergeMessage(mergeCommit.Message, context.Configuration);
return mergeMessage;
}
private static MergeMessage? Inner(ICommit mergeCommit, GitVersionContext context) =>
MergeMessage.TryParse(mergeCommit, context.Configuration, out MergeMessage? mergeMessage)
? mergeMessage
: null;
}