Skip to content

Issue #2165 WorkingTree uses incorrect commit. #2166

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
tpaxatb wants to merge 1 commit into from
Closed

Issue #2165 WorkingTree uses incorrect commit. #2166

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
7 changes: 1 addition & 6 deletions src/GitVersionCore/Extensions/ArgumentExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,7 @@ public static string GetDotGitDirectory(this Arguments arguments)

public static string GetProjectRootDirectory(this Arguments arguments)
{
if (arguments.IsDynamicGitRepository())
{
return arguments.GetWorkingDirectory();
}

var dotGitDirectory = Repository.Discover(arguments.GetWorkingDirectory());
var dotGitDirectory = Repository.Discover(arguments.IsDynamicGitRepository() ? arguments.DynamicGitRepositoryPath : arguments.GetWorkingDirectory());

if (string.IsNullOrEmpty(dotGitDirectory))
throw new DirectoryNotFoundException($"Can't find the .git directory in {dotGitDirectory}");
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore/GitVersionCalculator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private VersionVariables ExecuteInternal(Arguments arguments)
{
var configuration = configProvider.Provide(overrideConfig: arguments.OverrideConfig);

using var repo = new Repository(arguments.GetDotGitDirectory());
using var repo = new Repository(arguments.GetProjectRootDirectory());
var targetBranch = repo.GetTargetBranch(arguments.TargetBranch);
var gitVersionContext = new GitVersionContext(repo, log, targetBranch, configuration, commitId: arguments.CommitId);
var semanticVersion = nextVersionCalculator.FindVersion(gitVersionContext);
Expand Down