utils-code/jesseduffield.lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-09-10 23:56:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Signal ambiguity in the move-commits-to-new-branch label and prompt

Browse source 
Same idea as the rebase and view-divergence labels: when the base is
ambiguous, the menu prompt and the "New branch from base branch (...)"
item both substitute "pick: main, develop" for the parenthetical so
the user knows the disambiguation picker will appear before they pick
the "from base" option.
This commit is contained in:
Stefan Haller 2026-05-22 18:19:23 +02:00
parent d688fa9319
commit cee2de60ba
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkg/gui/controllers/helpers/refs_helper.go
View file

@ -480,11 +480,19 @@ func (self *RefsHelper) MoveCommitsToNewBranch() error {
return nil
}
shortBaseBranchName := ShortBranchName(baseBranchRef)
baseBranchLabel := ShortBranchName(baseBranchRef)
if baseAmbiguous {
shortNames := lo.Map(baseCandidates, func(ref string, _ int) string {
return ShortBranchName(ref)
})
baseBranchLabel = utils.ResolvePlaceholderString(self.c.Tr.PickBaseBranchLabel,
map[string]string{"candidates": strings.Join(shortNames, ", ")},
)
}
prompt := utils.ResolvePlaceholderString(
self.c.Tr.MoveCommitsToNewBranchMenuPrompt,
map[string]string{
"baseBranchName": shortBaseBranchName,
"baseBranchName": baseBranchLabel,
},
)
return self.c.Menu(types.CreateMenuOptions{
@ -492,7 +500,7 @@ func (self *RefsHelper) MoveCommitsToNewBranch() error {
Prompt: prompt,
Items: []*types.MenuItem{
{
Label: fmt.Sprintf(self.c.Tr.MoveCommitsToNewBranchFromBaseItem, shortBaseBranchName),
Label: fmt.Sprintf(self.c.Tr.MoveCommitsToNewBranchFromBaseItem, baseBranchLabel),
OnPress: func() error {
moveOff := func(base string) error {
return withNewBranchNamePrompt(ShortBranchName(base), func(newBranchName string) error {