Skip to content

Compare a linked worktree's path the way git spells it #12

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
siegfriedpammer merged 1 commit into from
Sep 11, 2026
Merged

Compare a linked worktree's path the way git spells it #12

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
5 changes: 3 additions & 2 deletions tests/Stampeded.Core.Tests/GitRebaseTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ public async Task TheStateIsFoundInALinkedWorktreeWithoutAskingGit()
// repository with forty worktrees would otherwise cost forty processes per check.
string other = NewDirectory();
await Git(repo, "worktree", "add", "--quiet", other, "topic");
string otherAsGitReportsIt = await AsGitReports(other);
var git = new GitService(repo);
Assert.That(await git.InProgressInAsync(other), Is.Null);

Expand All @@ -329,8 +330,8 @@ public async Task TheStateIsFoundInALinkedWorktreeWithoutAskingGit()

Assert.That(await git.InProgressInAsync(other), Is.EqualTo(GitOperation.Rebase));
var found = await git.ListInProgressAsync();
Assert.That(found.Select(o => o.WorkingDirectory), Does.Contain(other));
Assert.That(found.Single(o => o.WorkingDirectory == other).Branch, Is.EqualTo("wt-topic"),
Assert.That(found.Select(o => o.WorkingDirectory), Does.Contain(otherAsGitReportsIt));
Assert.That(found.Single(o => o.WorkingDirectory == otherAsGitReportsIt).Branch, Is.EqualTo("wt-topic"),
"the branch is read from the rebase state, since the worktree is detached while it runs");

await Git(other, "rebase", "--abort");
Expand Down