sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Fix resetting or rebasing a branch to its upstream when the upstream branch name is different

Browse Source
This commit is contained in:
Stefan Haller
2025-01-04 15:18:22 +01:00
parent 33e81f717d
commit 009062534e
3 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/integration/tests/branch/rebase_to_upstream.go
View File

@ -65,10 +65,7 @@ var RebaseToUpstream = NewIntegrationTest(NewIntegrationTestArgs{
Tap(func() {
t.ExpectPopup().Menu().
Title(Equals("Upstream options")).
/* EXPECTED:
Select(Contains("Rebase checked-out branch onto origin/master...")).
ACTUAL: */
Select(Contains("Rebase checked-out branch onto origin/master-local...")).
Confirm()
t.ExpectPopup().Menu().
Title(Equals("Rebase 'target'")).