Skip to content

Fix rebase and merge operations when branches are checked out in worktrees #362

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
geofflamrock merged 17 commits into from
Sep 23, 2025
Merged

Fix rebase and merge operations when branches are checked out in worktrees #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
47a807b
Implement worktree support for rebase and merge operations
Copilot Sep 7, 2025
460d831
Refactor GitClient and GitClientFactory to use working directory inst…
Copilot Sep 8, 2025
67362a5
Update additional command handlers to use IGitClientFactory pattern
Copilot Sep 8, 2025
4ae6491
Update GitClient tests and fix factory method names
Copilot Sep 8, 2025
90e8dc4
Refactor command handlers to use IGitClientFactory instead of IGitClient
Copilot Sep 8, 2025
b8d7bf4
Complete refactoring: update all remaining test files to use IGitClie…
Copilot Sep 8, 2025
9d8dce4
Fix build
geofflamrock Sep 18, 2025
3aea675
Fixes
geofflamrock Sep 18, 2025
44b62ec
Cleanup
geofflamrock Sep 18, 2025
eae642a
Fix DI issue
geofflamrock Sep 18, 2025
4ff4b1c
Fix build
geofflamrock Sep 18, 2025
63f589e
Fix rebase in progress for worktrees
geofflamrock Sep 19, 2025
463f6c2
Add a test for checking if rebase is in progress for a worktree
geofflamrock Sep 20, 2025
c49ffe8
Improve test
geofflamrock Sep 20, 2025
0e46ad8
Fix test failure
geofflamrock Sep 20, 2025
341d55a
Add tests for updating with worktree branches
geofflamrock Sep 22, 2025
46928bc
Cleanup
geofflamrock Sep 22, 2025
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
55 changes: 46 additions & 9 deletions src/Stack.Tests/Commands/Branch/AddBranchCommandHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Stack.Config;
using Stack.Git;
using Stack.Infrastructure;
using Stack.Infrastructure.Settings;
using Stack.Tests.Helpers;
using Xunit.Abstractions;

Expand Down Expand Up @@ -42,7 +43,11 @@ public async Task WhenNoInputsProvided_AsksForStackAndBranchAndParentBranchAndCo
.WithRemoteUri(remoteUri)
.WithSourceBranch(sourceBranch))
.Build();
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
inputProvider.Select(Questions.SelectBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(branchToAdd);
Expand Down Expand Up @@ -83,7 +88,11 @@ public async Task WhenStackNameProvided_DoesNotAskForStackName_AddsBranchFromSta
gitClient.GetCurrentBranch().Returns(sourceBranch);
gitClient.GetLocalBranchesOrderedByMostRecentCommitterDate().Returns(new[] { sourceBranch, anotherBranch, branchToAdd });
gitClient.DoesLocalBranchExist(branchToAdd).Returns(true);
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Select(Questions.SelectBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(branchToAdd);
inputProvider.Select(Questions.SelectParentBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(anotherBranch);
Expand Down Expand Up @@ -123,7 +132,11 @@ public async Task WhenOnlyOneStackExists_DoesNotAskForStackName_AddsBranchFromSt
gitClient.GetCurrentBranch().Returns(sourceBranch);
gitClient.GetLocalBranchesOrderedByMostRecentCommitterDate().Returns(new[] { sourceBranch, anotherBranch, branchToAdd });
gitClient.DoesLocalBranchExist(branchToAdd).Returns(true);
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Select(Questions.SelectBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(branchToAdd);
inputProvider.Select(Questions.SelectParentBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(anotherBranch);
Expand Down Expand Up @@ -163,7 +176,11 @@ public async Task WhenStackNameProvided_ButStackDoesNotExist_Throws()
gitClient.GetCurrentBranch().Returns(sourceBranch);
gitClient.GetLocalBranchesOrderedByMostRecentCommitterDate().Returns(new[] { sourceBranch, anotherBranch, branchToAdd });
gitClient.DoesLocalBranchExist(branchToAdd).Returns(true);
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

// Act and assert
var invalidStackName = Some.Name();
Expand Down Expand Up @@ -197,7 +214,11 @@ public async Task WhenBranchNameProvided_DoesNotAskForBranchName_AddsBranchFromS
gitClient.GetCurrentBranch().Returns(sourceBranch);
gitClient.GetLocalBranchesOrderedByMostRecentCommitterDate().Returns(new[] { sourceBranch, anotherBranch, branchToAdd });
gitClient.DoesLocalBranchExist(branchToAdd).Returns(true);
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
inputProvider.Select(Questions.SelectParentBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(anotherBranch);
Expand Down Expand Up @@ -238,7 +259,11 @@ public async Task WhenBranchNameProvided_ButBranchDoesNotExistLocally_Throws()
gitClient.GetCurrentBranch().Returns(sourceBranch);
gitClient.GetLocalBranchesOrderedByMostRecentCommitterDate().Returns(new[] { sourceBranch, anotherBranch, branchToAdd });
gitClient.DoesLocalBranchExist(branchToAdd).Returns(true);
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");

Expand Down Expand Up @@ -277,7 +302,11 @@ public async Task WhenBranchNameProvided_ButBranchAlreadyExistsInStack_Throws()
gitClient.GetCurrentBranch().Returns(sourceBranch);
gitClient.GetLocalBranchesOrderedByMostRecentCommitterDate().Returns(new[] { sourceBranch, anotherBranch, branchToAdd });
gitClient.DoesLocalBranchExist(branchToAdd).Returns(true);
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");

Expand Down Expand Up @@ -312,7 +341,11 @@ public async Task WhenAllInputsProvided_DoesNotAskForAnything_AddsBranchFromStac
gitClient.GetCurrentBranch().Returns(sourceBranch);
gitClient.GetLocalBranchesOrderedByMostRecentCommitterDate().Returns(new[] { sourceBranch, anotherBranch, branchToAdd });
gitClient.DoesLocalBranchExist(branchToAdd).Returns(true);
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

// Act
await handler.Handle(new AddBranchCommandInputs("Stack1", branchToAdd, anotherBranch), CancellationToken.None);
Expand Down Expand Up @@ -354,7 +387,11 @@ public async Task WhenParentBranchProvided_DoesNotAskForParentBranch_CreatesNewB
.WithRemoteUri(remoteUri)
.WithSourceBranch(sourceBranch))
.Build();
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new AddBranchCommandHandler(inputProvider, logger, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
inputProvider.Select(Questions.SelectBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(branchToAdd);
Expand Down
61 changes: 51 additions & 10 deletions src/Stack.Tests/Commands/Branch/NewBranchCommandHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Stack.Config;
using Stack.Git;
using Stack.Infrastructure;
using Stack.Infrastructure.Settings;
using Stack.Tests.Helpers;
using Xunit.Abstractions;

Expand Down Expand Up @@ -38,7 +39,11 @@ public async Task WhenNoInputsProvided_AsksForStackAndBranchAndParentBranch_Crea
.WithRemoteUri(remoteUri)
.WithSourceBranch(sourceBranch))
.Build();
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
inputProvider.Text(Questions.BranchName, Arg.Any<CancellationToken>(), Arg.Any<string>()).Returns(newBranch);
Expand Down Expand Up @@ -85,7 +90,11 @@ public async Task WhenStackNameProvided_DoesNotAskForStackName_CreatesAndAddsBra
.WithRemoteUri(remoteUri)
.WithSourceBranch(sourceBranch))
.Build();
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Text(Questions.BranchName, Arg.Any<CancellationToken>(), Arg.Any<string>()).Returns(newBranch);
inputProvider.Select(Questions.SelectParentBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(anotherBranch);
Expand Down Expand Up @@ -127,7 +136,11 @@ public async Task WhenOnlyOneStackExists_DoesNotAskForStackName_CreatesAndAddsBr
.WithSourceBranch(sourceBranch)
.WithBranch(branch => branch.WithName(anotherBranch)))
.Build();
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Text(Questions.BranchName, Arg.Any<CancellationToken>(), Arg.Any<string>()).Returns(newBranch);
inputProvider.Select(Questions.SelectParentBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(anotherBranch);
Expand Down Expand Up @@ -172,7 +185,11 @@ public async Task WhenStackNameProvided_ButStackDoesNotExist_Throws()
.WithRemoteUri(remoteUri)
.WithSourceBranch(sourceBranch))
.Build();
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

gitClient.GetRemoteUri().Returns(remoteUri);
gitClient.GetCurrentBranch().Returns(sourceBranch);
Expand Down Expand Up @@ -210,7 +227,11 @@ public async Task WhenBranchNameProvided_DoesNotAskForBranchName_CreatesAndAddsB
.WithRemoteUri(remoteUri)
.WithSourceBranch(sourceBranch))
.Build();
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
inputProvider.Select(Questions.SelectParentBranch, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns(anotherBranch);
Expand Down Expand Up @@ -254,7 +275,11 @@ public async Task WhenBranchNameProvided_ButBranchAlreadyExistLocally_Throws()
.WithRemoteUri(remoteUri)
.WithSourceBranch(sourceBranch))
.Build();
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
gitClient.GetRemoteUri().Returns(remoteUri);
Expand Down Expand Up @@ -295,7 +320,11 @@ public async Task WhenBranchNameProvided_ButBranchAlreadyExistsInStack_Throws()
.WithRemoteUri(remoteUri)
.WithSourceBranch(sourceBranch))
.Build();
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
gitClient.GetRemoteUri().Returns(remoteUri);
Expand Down Expand Up @@ -334,7 +363,11 @@ public async Task WhenPushToTheRemoteFails_StillCreatesTheBranchLocallyAndAddsIt
.WithRemoteUri(remoteUri)
.WithSourceBranch(sourceBranch))
.Build();
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

gitClient.When(gc => gc.PushNewBranch(newBranch)).Do(_ => { throw new Exception("Failed to push branch"); });

Expand Down Expand Up @@ -385,7 +418,11 @@ public async Task WhenParentBranchNotProvided_AsksForParentBranch_CreatesNewBran
.WithRemoteUri(remoteUri)
.WithSourceBranch(sourceBranch))
.Build();
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
inputProvider.Text(Questions.BranchName, Arg.Any<CancellationToken>(), Arg.Any<string>()).Returns(newBranch);
Expand Down Expand Up @@ -433,7 +470,11 @@ public async Task WhenParentBranchProvided_DoesNotAskForParentBranch_CreatesNewB
.WithRemoteUri(remoteUri)
.WithSourceBranch(sourceBranch))
.Build();
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClient, stackConfig);
var gitClientFactory = Substitute.For<IGitClientFactory>();
var executionContext = new CliExecutionContext { WorkingDirectory = "/some/path" };
var handler = new NewBranchCommandHandler(inputProvider, logger, displayProvider, gitClientFactory, executionContext, stackConfig);

gitClientFactory.Create(executionContext.WorkingDirectory).Returns(gitClient);

inputProvider.Select(Questions.SelectStack, Arg.Any<string[]>(), Arg.Any<CancellationToken>()).Returns("Stack1");
inputProvider.Text(Questions.BranchName, Arg.Any<CancellationToken>(), Arg.Any<string>()).Returns(newBranch);
Expand Down
Loading
Loading