1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-17 00:18:05 +02:00

Shorten the waiting status for fast-forwarding a branch

Now that we no longer show it in a loader panel, but in the app status view,
it's awkwardly long (the loading animation is much further to the right than for
other waiting status texts). Hopefully seeing just "Fast-forwarding <branch>" is
enough to be able to tell what's happening.
This commit is contained in:
Stefan Haller
2023-08-29 18:35:18 +02:00
parent 864a9ada57
commit fc868cdda5
7 changed files with 9 additions and 10 deletions

View File

@ -537,10 +537,9 @@ func (self *BranchesController) fastForward(branch *models.Branch) error {
action := self.c.Tr.Actions.FastForwardBranch
message := utils.ResolvePlaceholderString(
self.c.Tr.Fetching,
self.c.Tr.FastForwarding,
map[string]string{
"from": fmt.Sprintf("%s/%s", branch.UpstreamRemote, branch.UpstreamBranch),
"to": branch.Name,
"branch": branch.Name,
},
)