Skip to content

Commit

Permalink
fix: changed 'WorkingCopy' to preserve 'workingDirectory' set in args…
Browse files Browse the repository at this point in the history
… while still resolving directory of '.git' folder
  • Loading branch information
Tobbe3108 authored and cabauman committed Feb 3, 2023
1 parent 48634a4 commit 89a9c8e
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions Versionize/WorkingCopy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,18 @@ namespace Versionize;

public class WorkingCopy
{
private readonly DirectoryInfo _directory;
private readonly DirectoryInfo _workingDirectory;
private readonly DirectoryInfo _gitDirectory;

private WorkingCopy(DirectoryInfo directory)
private WorkingCopy(DirectoryInfo workingDirectory, DirectoryInfo gitDirectory)
{
_directory = directory;
_workingDirectory = workingDirectory;
_gitDirectory = gitDirectory;
}

public SemanticVersion Inspect()
{
var workingDirectory = _directory.FullName;
var workingDirectory = _workingDirectory.FullName;

var projects = Projects.Discover(workingDirectory);

Expand All @@ -41,9 +43,10 @@ public SemanticVersion Inspect()

public SemanticVersion Versionize(VersionizeOptions options)
{
var workingDirectory = _directory.FullName;
var workingDirectory = _workingDirectory.FullName;
var gitDirectory = _gitDirectory.FullName;

using var repo = new Repository(workingDirectory);
using var repo = new Repository(gitDirectory);

var isDirty = repo.RetrieveStatus(new StatusOptions()).IsDirty;

Expand Down Expand Up @@ -218,7 +221,7 @@ public static WorkingCopy Discover(string workingDirectory)

if (isWorkingCopy)
{
return new WorkingCopy(workingCopyCandidate);
return new WorkingCopy(new DirectoryInfo(workingDirectory), workingCopyCandidate);
}

workingCopyCandidate = workingCopyCandidate.Parent;
Expand Down

0 comments on commit 89a9c8e

Please sign in to comment.