go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-19 22:33:16 +02:00
Code Issues Releases Activity

Fix unsetting upstream when it doesn't exist

Browse Source
This commit is contained in:
Luka Markušić 2023-11-04 17:48:31 +01:00
parent e0fc8fe25b
commit d145e818d0
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/gui/controllers/branches_controller.go
View File

@ -257,9 +257,12 @@ func (self *BranchesController) viewUpstreamOptions(selectedBranch *models.Branc
Key: 'r', Key: 'r',
} }
if !selectedBranch.IsTrackingRemote() {
unsetUpstreamItem.DisabledReason = self.c.Tr.UpstreamNotSetError
}
if !selectedBranch.RemoteBranchStoredLocally() { if !selectedBranch.RemoteBranchStoredLocally() {
viewDivergenceItem.DisabledReason = self.c.Tr.UpstreamNotSetError viewDivergenceItem.DisabledReason = self.c.Tr.UpstreamNotSetError
unsetUpstreamItem.DisabledReason = self.c.Tr.UpstreamNotSetError
upstreamResetItem.DisabledReason = self.c.Tr.UpstreamNotSetError upstreamResetItem.DisabledReason = self.c.Tr.UpstreamNotSetError
upstreamRebaseItem.DisabledReason = self.c.Tr.UpstreamNotSetError upstreamRebaseItem.DisabledReason = self.c.Tr.UpstreamNotSetError
} }

6
pkg/integration/tests/branch/unset_upstream.go
View File

@ -51,13 +51,9 @@ var UnsetUpstream = NewIntegrationTest(NewIntegrationTestArgs{
Title(Equals("Upstream options")). Title(Equals("Upstream options")).
Select(Contains("Unset upstream of selected branch")). Select(Contains("Unset upstream of selected branch")).
Confirm() Confirm()
t.ExpectPopup().Alert().
Title(Equals("Error")).
Content(Equals("The selected branch has no upstream (or the upstream is not stored locally)")).
Cancel()
}). }).
SelectedLines( SelectedLines(
Contains("branch_to_remove").Contains("origin branch_to_remove").Contains("upstream gone"), Contains("branch_to_remove").DoesNotContain("origin branch_to_remove").DoesNotContain("upstream gone"),
) )
}, },
}) })