Version not bumped if an irrelevant tag exists in latest commit

[adaskos-signal]

Hi all.
I'm trying to understand if this is a bug or I'm missing something.
When a tag exists in the latest commit, GitVersion will not parse the commit message and bump version according to the rules.

Minimal steps to reproduce:
(assuming a git repo which currently calculates version as 1.0.0)
Add a bumping commit:

git commit --allow-empty -m "+semver: major"

Now dotnet gitversion /showvariable semver will give the correct version (2.0.0)

If I first tag the commit:

git tag "BLAH"

the same command will give me version 1.0.1 although the tag has no semantic versioning.

This has implications in our CI build and I don't believe it's the expected behavior.

[adaskos-signal]

I believe this is related to #3071 and FindCommitMessageIncrement. Any tag will stop the search for increments, when it should only consider ValidVersionTags based on tag prefix.

[adaskos-signal]

I'm not at ease with contributing to a project and it would take me some time to understand all the various parts of GitVersion, but if it helps I wrote a unit test, inside VersionBumpingScenarios.cs:

[Test]
public void CanUseCommitMessagesToBumpVersion_TagDoesNotTakePriorityIfNotAVersion()
{
    using var fixture = new EmptyRepositoryFixture();
    var repo = fixture.Repository;

    repo.MakeATaggedCommit("1.0.0");
    repo.MakeACommit("+semver:major");
    fixture.AssertFullSemver("2.0.0+1");

    repo.ApplyTag("NotAVersion");
    fixture.AssertFullSemver("2.0.0+1");

    repo.MakeACommit();
    fixture.AssertFullSemver("2.0.0+2");
}

I could make it pass - without breaking any of the existing tests - by using an IRepositoryStore repositoryStore inside IncrementStrategyFinder and then used the following inside FindCommitMessageIncrement:

var tags = new HashSet<string?>(
        //only commits with valid version tag should be considered (see #3757)
        this.repositoryStore.GetValidVersionTags(context.FullConfiguration.TagPrefix)
            .Select(x => x.Tag)
    .Select(t => t.TargetSha));

But other than that I cannot tell if it has any performance implications, or if it covers the rest of the cases/tools/build tasks/etc.
I'm just trying to help in hope of a quick fix 😇

[HHobeck]

Hi @adaskos-signal .

Thank you for providing such detail information. In my opinion you are on the right track. Please provide a PR to fix this issue based on the main branch. In advance I want to tell you that we are in development phase and just releasing beta versions at this moment. Performance is something we need to address at the end of the development phase.

Cheers

[adaskos-signal]

Any chance this will end in the 5.x support branch too?

[arturcic]

branch 5.x is now readonly, we won't release any new version from the 5.x

[adaskos-signal]

I created a PR #3759 for this.

[Sefriol]

@adaskos-signal in my case the "irrelevant" tag is actually an alpha release from dev since we use rebase fast forward when merging from dev to main. Would your PR be relevant to this issue as well?