Duplicated version for release branch observed

[ysyvachenko]

Hi,

I am using recent version of gitversion (v4.0.0-beta0007) installed from chocolatey.

In default configuration I observed duplicated FullSemVer for different commits. It seems that first commit in release branch has wrong metadata +1, but should have +0.

Screen shot of my test repository:

Branches started with 'ver' are auto-generated from FullSemVer variable.

Commit 7842238c9e4777d31cb3c4274949793969e4b9ef on 'release/1.0.0' branch has version '1.0.0-beta.1+1'.
Gitversion generates the same version for commit ad54234fc1329bfd64191b83d08e1fcb491ab7c7. That is why my script cannot add a branch with version - it will be duplicated branch name in git.

But the third commit c5c52f748426f9316e393a585b66818ad2be9d96 has correct version '1.0.0-beta.1+2'

It looks like this is a bug and version for 7842238c9e4777d31cb3c4274949793969e4b9ef should be '1.0.0-beta.1+0'.

I have attached test repo and script to reproduce this issue in zip archive:
test-repo.zip

Many thanks,
Yevgen.

[JakeGinnivan]

Hi @eugene-sivachenko

Can you create a github repository or even better write a test which reproduces this, I am not a fan of downloading random zip files from issues.

[JakeGinnivan]

Though it does look like a legit bug based on your comment.

[czesiu]

I think that I have similar problem. Here's the test repository: https://github.com/czesiu/GitVersion.Test

Looks like the problem is related with merge release branch to develop. After this merge and commit something on develop counter on release branch resets.

Here's screen describing problem:

Take a look at "Third release commit". Before commit #ec1af0d on develop it has proper version: 0.2.0-beta0003, but after this commit version was changed to 0.2.0-beta0003 (merge commit resets counter).

I'm using GitVersion 3.6.4.

[asbjornu]

@czesiu: Would it be too much to ask for you to reproduce this in a unit test? It's fairly easy to perform the Git actions required in the RepositoryFixture based tests, and that would pinpoint the problem and make it much easier to fix. Also, does upgrading to version 4 of GitVersion help?

[czesiu]

I tested on 4.0.0-beta.9 and the same problem occurs.

Here's the unit test:

[Test]
public void Test()
{
    var config = new Config
    {
        VersioningMode = VersioningMode.ContinuousDeployment
    };

    using (var fixture = new EmptyRepositoryFixture())
    {
        // Initial master commit
        fixture.Repository.MakeACommit();

        // Create develop from master
        fixture.Repository.CreateBranch("develop");
        Commands.Checkout(fixture.Repository, "develop");

        // Create release from develop
        fixture.Repository.CreateBranch("release-0.2.0");
        Commands.Checkout(fixture.Repository, "release-0.2.0");

        fixture.AssertFullSemver(config, "0.2.0-beta.0");

        // Make some commits on release
        var releaseCommit1 = fixture.Repository.MakeACommit();
        var releaseCommit2 = fixture.Repository.MakeACommit();

        fixture.AssertFullSemver(config, "0.2.0-beta.2");

        // Merge release to develop
        Commands.Checkout(fixture.Repository, "develop");
        fixture.Repository.Merge(releaseCommit2,
            new Signature(new Identity("czesiu", "czesiu@github.com"), DateTimeOffset.Now),
            new MergeOptions { FastForwardStrategy = FastForwardStrategy.NoFastForward });

        // Make some new commit on release
        Commands.Checkout(fixture.Repository, "release-0.2.0");
        fixture.Repository.MakeACommit();

        fixture.AssertFullSemver(config, "0.2.0-beta.3"); // Here version is ok

        // Make new commit on develop
        Commands.Checkout(fixture.Repository, "develop");
        fixture.Repository.MakeACommit();

        // Checkout to release (no new commits) 
        Commands.Checkout(fixture.Repository, "release-0.2.0");

        fixture.AssertFullSemver(config, "0.2.0-beta.3"); // Shouldly.ShouldAssertException : variables.FullSemVer should be "0.2.0-beta.3" but was "0.2.0-beta.1"
    }
}

[czesiu]

Something new on this topic?

[asbjornu]

@czesiu: Sorry, I haven't had time to open up the GitVersion solution in a while, so no time to look at this. Would you be up for the task of providing the failing test and perhaps even a fix for it as a pull request? Just shout out if you wonder about any step of the process, and I'll assist you as best I can. Joining our Gitter channel might give you a bit more immediate response when you're in the middle of it.

[czesiu]

I added PR #1136 with test & fix proposition. More info in PR. I also joined gitter chat, so if you want to, you can write to me there.

[asbjornu]

@czesiu: Thanks, excellent!
@eugene-sivachenko: Does #1136 describe and fix your problem as well?

[czesiu]

I think we can close this issue. There is no response from @eugene-sivachenko from about 4 months.