Skip to content

feat: Enhances git repo detection for worktrees #181

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

Merged
BenjaminMichaelis merged 1 commit into from
Feb 26, 2026
Merged

feat: Enhances git repo detection for worktrees #181

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
21 changes: 21 additions & 0 deletions IntelliTect.Multitool.Tests/RepositoryPaths.Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,25 @@ public void TrySearchForGitContainingDirectory_ReturnsFalseWhenNotFound()
Assert.False(RepositoryPaths.TrySearchForGitContainingDirectory(new DirectoryInfo(path), out string gitParentDirectory));
Assert.Empty(gitParentDirectory);
}

[Fact]
public void TrySearchForGitContainingDirectory_ReturnsTrueWhenGitIsAFile()
{
// In a git worktree, .git is a file (gitfile pointer), not a directory.
// This test simulates that scenario.
string tempRoot = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
string subDir = Path.Combine(tempRoot, "subdir");
try
{
Directory.CreateDirectory(subDir);
File.WriteAllText(Path.Combine(tempRoot, ".git"), "gitdir: ../.git/worktrees/my-branch");

Assert.True(RepositoryPaths.TrySearchForGitContainingDirectory(new DirectoryInfo(subDir), out string gitParentDirectory));
Assert.Equal(tempRoot, gitParentDirectory);
}
finally
{
Directory.Delete(tempRoot, recursive: true);
}
}
}
3 changes: 2 additions & 1 deletion IntelliTect.Multitool/Build/IntelliTect.Multitool.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
</LUTInformation>
</PropertyGroup>

<WriteLinesToFile File="$(TempStagingPath)\IntelliTect.MultiTool.BuildVariables.tmp" Overwrite="true" Lines="$(LUTInformation)" />
<WriteLinesToFile File="$(TempStagingPath)\IntelliTect.MultiTool.BuildVariables.tmp" Overwrite="true" Lines="$(LUTInformation)" Condition="'$(SolutionDir)' != ''" />
<WriteLinesToFile File="$(TempStagingPath)\IntelliTect.MultiTool.BuildVariables.tmp" Overwrite="true" Lines="$(LUTInformation)" Condition="'$(SolutionDir)' == '' AND !Exists('$(TempStagingPath)\IntelliTect.MultiTool.BuildVariables.tmp')" />
</Target>
</Project>
3 changes: 2 additions & 1 deletion IntelliTect.Multitool/RepositoryPaths.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ public static bool TrySearchForGitContainingDirectory(DirectoryInfo? searchStart
while (searchStartDirectory is not null)
{
DirectoryInfo[] subDirectories = searchStartDirectory.GetDirectories(".git");
if (subDirectories.Length > 0)
// Also check for a .git file (present in git worktrees as a gitfile pointer)
if (subDirectories.Length > 0 || File.Exists(Path.Combine(searchStartDirectory.FullName, ".git")))
{
gitParentDirectory = searchStartDirectory.FullName;
return true;
Expand Down
Loading