Skip to content

Commit 567c7bc

Browse files
committed
1 parent 942ba6d commit 567c7bc

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

test/Nerdbank.GitVersioning.Tests/VersionOracleTests.cs

+6-2
Original file line numberDiff line numberDiff line change
@@ -604,16 +604,20 @@ public void Worktree_Support(bool detachedHead)
604604

605605
string workTreePath = this.CreateDirectoryForNewRepo();
606606
Directory.Delete(workTreePath);
607+
Worktree worktree;
607608
if (detachedHead)
608609
{
609-
this.LibGit2Repository.Worktrees.Add("HEAD~1", "myworktree", workTreePath, isLocked: false);
610+
worktree = this.LibGit2Repository.Worktrees.Add("HEAD~1", "myworktree", workTreePath, isLocked: false);
610611
}
611612
else
612613
{
613614
this.LibGit2Repository.Branches.Add("wtbranch", "HEAD~1");
614-
this.LibGit2Repository.Worktrees.Add("wtbranch", "myworktree", workTreePath, isLocked: false);
615+
worktree = this.LibGit2Repository.Worktrees.Add("wtbranch", "myworktree", workTreePath, isLocked: false);
615616
}
616617

618+
// Workaround for https://github.com/libgit2/libgit2sharp/issues/2037
619+
Commands.Checkout(worktree.WorktreeRepository, "HEAD", new CheckoutOptions { CheckoutModifiers = CheckoutModifiers.Force });
620+
617621
GitContext context = this.CreateGitContext(workTreePath);
618622
var oracleWorkTree = new VersionOracle(context);
619623
Assert.Equal(oracleOriginal.Version, oracleWorkTree.Version);

0 commit comments

Comments
 (0)