Skip to content

Resolve incorrect generation of meta count when remote tracking #441

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.

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 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all 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
38 changes: 38 additions & 0 deletions GitVersionCore.Tests/IntegrationTests/RemoteRepositoryScenarios.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,42 @@ public void GivenARemoteGitRepositoryWhenCheckingOutDetachedhead_UsingTrackingBr
fixture.AssertFullSemver("0.1.0+4", fixture.LocalRepository);
}
}

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

using (var fixture = new RemoteRepositoryFixture(config))
{
const string TaggedVersion = "2.0";
fixture.Repository.MakeATaggedCommit(TaggedVersion);
var remoteBranch = fixture.Repository.CreateBranch("release-3.0");
fixture.LocalRepository.Network.Fetch(fixture.LocalRepository.Network.Remotes["origin"]);
var localBranch = fixture.LocalRepository.CreateBranch("release-3.0", remoteBranch.Tip);

fixture.LocalRepository.Branches.Update(localBranch, b =>
{
b.TrackedBranch = remoteBranch.CanonicalName;
});

var trackingBranch = fixture.LocalRepository.Branches["release-3.0"];
fixture.LocalRepository.Checkout(trackingBranch);
fixture.LocalRepository.MakeCommits(4);



// Check version before push to remote.
fixture.AssertFullSemver("3.0.0-beta.4", fixture.LocalRepository);

//TODO: This is not supported in LibGit2Sharp
//fixture.LocalRepository.Network.Push(fixture.LocalRepository.Network.Remotes["origin"], @"refs/heads/release-3.0");

// Check version after push to remote
//fixture.AssertFullSemver("3.0.0-beta.4", fixture.LocalRepository);
}
}
}
2 changes: 1 addition & 1 deletion GitVersionCore/LibGitExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public static IEnumerable<Branch> GetBranchesContainingCommit(this Commit commit
yield break;
}

foreach (var branch in repository.Branches)
foreach (var branch in repository.Branches.Where(b => (onlyTrackedBranches && !b.IsTracking)))
{
var commits = repository.Commits.QueryBy(new CommitFilter { Since = branch }).Where(c => c.Sha == commit.Sha);

Expand Down