Merge branch 'master' into master

cowboy8625 · web-flow · commit ff464c0e5ba9 · 2025-08-14T07:47:41.000-05:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -149,10 +149,3 @@ jobs:
           args: release --clean
         env:
           GITHUB_TOKEN: ${{secrets.LAZYGIT_RELEASE_PAT}}
-
-      - name: Bump Homebrew formula
-        uses: dawidd6/action-homebrew-bump-formula@v3
-        with:
-          token: ${{secrets.LAZYGIT_RELEASE_PAT}}
-          formula: lazygit
-          tag: ${{env.new_tag}}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -118,10 +118,24 @@ Lazygit supports [Nerd Fonts](https://www.nerdfonts.com) to render certain icons
 
 ## Internationalisation
 
-Boy that's a hard word to spell. Anyway, lazygit is translated into several languages within the pkg/i18n package. If you need to render text to the user, you should add a new field to the TranslationSet struct in `pkg/i18n/english.go` and add the actual content within the `EnglishTranslationSet()` method in the same file. Then you can access via `gui.Tr.YourNewText` (or `self.c.Tr.YourNewText`, etc). Although it is appreciated if you translate the text into other languages, it's not expected of you (google translate will likely do a bad job anyway!).
+Boy that's a hard word to spell. Anyway, lazygit is translated into several languages within the pkg/i18n package. 
+
+### For developers adding new text
+
+If you need to render text to the user, you should add a new field to the TranslationSet struct in `pkg/i18n/english.go` and add the actual content within the `EnglishTranslationSet()` method in the same file. Then you can access via `gui.Tr.YourNewText` (or `self.c.Tr.YourNewText`, etc).
 
 Note, we use 'Sentence case' for everything (so no 'Title Case' or 'whatever-it's-called-when-there's-no-capital-letters-case')
 
+### For translators
+
+Lazygit translations are managed through [Crowdin](https://crowdin.com/project/lazygit/). If you'd like to contribute translations:
+
+1. Join the Crowdin project at https://crowdin.com/project/lazygit/
+2. Select your target language and help translate missing strings
+3. The translation files in `pkg/i18n/translations/` are managed by the maintainers - please don't edit them directly
+
+For detailed information about the translation process, including how maintainers sync translations, see `pkg/i18n/translations/README.md`.
+
 ## Debugging
 
 The easiest way to debug lazygit is to have two terminal tabs open at once: one for running lazygit (via `go run main.go -debug` in the project root) and one for viewing lazygit's logs (which can be done via `go run main.go --logs` or just `lazygit --logs`).
diff --git a/Makefile b/Makefile
@@ -34,9 +34,11 @@ test: unit-test integration-test-all
 generate:
 	go generate ./...
 
+# If you execute `gofumpt -l -w .`, it will format all Go files in the current directory, including `test/_results/*` files.
+# We pass only Git-tracked Go files to gofumpt because we don't want to format the test results or get errors from it.
 .PHONY: format
 format:
-	gofumpt -l -w .
+	git ls-files '*.go' ':!vendor' | xargs gofumpt -l -w
 
 .PHONY: lint
 lint:
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@
 A simple terminal UI for git commands
 <br/>
 
-[![GitHub Releases](https://img.shields.io/github/downloads/jesseduffield/lazygit/total)](https://github.com/jesseduffield/lazygit/releases) [![Go Report Card](https://goreportcard.com/badge/github.com/jesseduffield/lazygit)](https://goreportcard.com/report/github.com/jesseduffield/lazygit) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/f46416b715d74622895657935fcada21)](https://app.codacy.com/gh/jesseduffield/lazygit/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/f46416b715d74622895657935fcada21)](https://app.codacy.com/gh/jesseduffield/lazygit/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage) [![GolangCI](https://golangci.com/badges/github.com/jesseduffield/lazygit.svg)](https://golangci.com) [![GitHub tag](https://img.shields.io/github/tag/jesseduffield/lazygit.svg)](https://github.com/jesseduffield/lazygit/releases/latest) [![homebrew](https://img.shields.io/homebrew/v/lazygit)](https://github.com/Homebrew/homebrew-core/blob/master/Formula/lazygit.rb)
+[![GitHub Releases](https://img.shields.io/github/downloads/jesseduffield/lazygit/total)](https://github.com/jesseduffield/lazygit/releases) [![Go Report Card](https://goreportcard.com/badge/github.com/jesseduffield/lazygit)](https://goreportcard.com/report/github.com/jesseduffield/lazygit) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/f46416b715d74622895657935fcada21)](https://app.codacy.com/gh/jesseduffield/lazygit/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/f46416b715d74622895657935fcada21)](https://app.codacy.com/gh/jesseduffield/lazygit/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage) [![golangci-lint](https://img.shields.io/badge/linted%20by-golangci--lint-brightgreen)](https://golangci-lint.run/) [![GitHub tag](https://img.shields.io/github/v/tag/jesseduffield/lazygit?color=blue)](https://github.com/jesseduffield/lazygit/releases/latest) [![homebrew](https://img.shields.io/homebrew/v/lazygit?color=blue)](https://formulae.brew.sh/formula/lazygit)
 
 ![commit_and_push](../assets/demo/commit_and_push-compressed.gif)
 
@@ -270,6 +270,14 @@ scoop bucket add extras
 scoop install lazygit
 ```
 
+### gah (Linux and Mac OS)
+
+You can install `lazygit` using [gah](https://github.com/marverix/gah/):
+
+```sh
+gah install lazygit
+```
+
 ### Arch Linux
 
 Packages for Arch Linux are available via pacman and AUR (Arch User Repository).
diff --git a/pkg/commands/oscommands/os.go b/pkg/commands/oscommands/os.go
@@ -1,7 +1,6 @@
 package oscommands
 
 import (
-	"fmt"
 	"io"
 	"os"
 	"os/exec"
@@ -329,15 +328,3 @@ func GetLazygitPath() string {
 	}
 	return `"` + filepath.ToSlash(ex) + `"`
 }
-
-func (c *OSCommand) UpdateWindowTitle() error {
-	if c.Platform.OS != "windows" {
-		return nil
-	}
-	path, getWdErr := os.Getwd()
-	if getWdErr != nil {
-		return getWdErr
-	}
-	argString := fmt.Sprint("title ", filepath.Base(path), " - Lazygit")
-	return c.Cmd.NewShell(argString, c.UserConfig().OS.ShellFunctionsFile).Run()
-}
diff --git a/pkg/commands/oscommands/os_default_platform.go b/pkg/commands/oscommands/os_default_platform.go
@@ -4,8 +4,10 @@ package oscommands
 
 import (
 	"os"
+	"os/exec"
 	"runtime"
 	"strings"
+	"syscall"
 )
 
 func GetPlatform() *Platform {
@@ -33,3 +35,15 @@ func getUserShell() string {
 
 	return "bash"
 }
+
+func (c *OSCommand) UpdateWindowTitle() error {
+	return nil
+}
+
+func TerminateProcessGracefully(cmd *exec.Cmd) error {
+	if cmd.Process == nil {
+		return nil
+	}
+
+	return cmd.Process.Signal(syscall.SIGTERM)
+}
diff --git a/pkg/commands/oscommands/os_windows.go b/pkg/commands/oscommands/os_windows.go
@@ -1,9 +1,30 @@
 package oscommands
 
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+)
+
 func GetPlatform() *Platform {
 	return &Platform{
 		OS:       "windows",
 		Shell:    "cmd",
 		ShellArg: "/c",
 	}
 }
+
+func (c *OSCommand) UpdateWindowTitle() error {
+	path, getWdErr := os.Getwd()
+	if getWdErr != nil {
+		return getWdErr
+	}
+	argString := fmt.Sprint("title ", filepath.Base(path), " - Lazygit")
+	return c.Cmd.NewShell(argString, c.UserConfig().OS.ShellFunctionsFile).Run()
+}
+
+func TerminateProcessGracefully(cmd *exec.Cmd) error {
+	// Signals other than SIGKILL are not supported on Windows
+	return nil
+}
diff --git a/pkg/gui/controllers/helpers/confirmation_helper.go b/pkg/gui/controllers/helpers/confirmation_helper.go
@@ -3,6 +3,7 @@ package helpers
 import (
 	goContext "context"
 	"fmt"
+	"strings"
 
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
@@ -168,7 +169,7 @@ func (self *ConfirmationHelper) CreatePopupPanel(ctx goContext.Context, opts typ
 		confirmationView.RenderTextArea()
 	} else {
 		self.c.ResetViewOrigin(confirmationView)
-		self.c.SetViewContent(confirmationView, style.AttrBold.Sprint(opts.Prompt))
+		self.c.SetViewContent(confirmationView, style.AttrBold.Sprint(strings.TrimSpace(opts.Prompt)))
 	}
 
 	self.setKeyBindings(cancel, opts)
diff --git a/pkg/gui/presentation/branches.go b/pkg/gui/presentation/branches.go
@@ -71,10 +71,11 @@ func getBranchDisplayStrings(
 	if showCommitHash {
 		availableWidth -= utils.COMMIT_HASH_SHORT_SIZE + 1
 	}
+	paddingNeededForDivergence := availableWidth
+
 	if checkedOutByWorkTree {
 		availableWidth -= utils.StringWidth(worktreeIcon) + 1
 	}
-	paddingNeededForDivergence := availableWidth
 
 	if len(branchStatus) > 0 {
 		availableWidth -= utils.StringWidth(utils.Decolorise(branchStatus)) + 1
diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
@@ -2143,7 +2143,7 @@ git:
 - The default selection mode in the staging and custom patch building views has been changed to hunk mode. This is the more useful mode in most cases, as it usually saves a lot of keystrokes. If you want to switch back to the old line mode default, you can do so by adding the following to your config:
 
 gui:
-  useHunkSelectionMode: false
+  useHunkModeInStagingView: false
 `,
 			"0.55.0": `- The 'redo' command, which used to be bound to ctrl-z, is now bound to shift-Z instead. This is because ctrl-z is now used for suspending the application; it is a commonly known keybinding for that in the Linux world. If you want to revert this change, you can do so by adding the following to your config:
 
diff --git a/pkg/tasks/tasks.go b/pkg/tasks/tasks.go
@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/jesseduffield/gocui"
+	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/utils"
 	"github.com/sasha-s/go-deadlock"
 	"github.com/sirupsen/logrus"
@@ -165,6 +166,17 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p
 				// and the user is flicking through a bunch of items.
 				self.throttle = time.Since(startTime) < THROTTLE_TIME && timeToStart > COMMAND_START_THRESHOLD
 
+				// Kill the still-running command. The only reason to do this is to save CPU usage
+				// when flicking through several very long diffs when diff.algorithm = histogram is
+				// being used, in which case multiple git processes continue to calculate expensive
+				// diffs in the background even though they have been stopped already.
+				//
+				// Unfortunately this will do nothing on Windows, so Windows users will have to live
+				// with the higher CPU usage.
+				if err := oscommands.TerminateProcessGracefully(cmd); err != nil {
+					self.Log.Errorf("error when trying to terminate cmd task: %v; Command: %v %v", err, cmd.Path, cmd.Args)
+				}
+
 				// close the task's stdout pipe (or the pty if we're using one) to make the command terminate
 				onDone()
 			}
@@ -291,11 +303,15 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p
 
 			refreshViewIfStale()
 
-			if err := cmd.Wait(); err != nil {
-				select {
-				case <-opts.Stop:
-					// it's fine if we've killed this program ourselves
-				default:
+			select {
+			case <-opts.Stop:
+				// If we stopped the task, don't block waiting for it; this could cause a delay if
+				// the process takes a while until it actually terminates. We still want to call
+				// Wait to reclaim any resources, but do it on a background goroutine, and ignore
+				// any errors.
+				go func() { _ = cmd.Wait() }()
+			default:
+				if err := cmd.Wait(); err != nil {
 					self.Log.Errorf("Unexpected error when running cmd task: %v; Failed command: %v %v", err, cmd.Path, cmd.Args)
 				}
 			}
diff --git a/pkg/utils/lines_test.go b/pkg/utils/lines_test.go
@@ -405,20 +405,6 @@ func TestWrapViewLinesToWidth(t *testing.T) {
 			expectedWrappedLinesIndices:  []int{0, 1, 2},
 			expectedOriginalLinesIndices: []int{0, 1, 2},
 		},
-		{
-			name:     "Avoid blank line at end if not editable",
-			wrap:     true,
-			editable: false,
-			text:     "First\nSecond\nThird\n",
-			width:    10,
-			expectedWrappedLines: []string{
-				"First",
-				"Second",
-				"Third",
-			},
-			expectedWrappedLinesIndices:  []int{0, 1, 2},
-			expectedOriginalLinesIndices: []int{0, 1, 2},
-		},
 		{
 			name:     "Keep blank line at end if editable",
 			wrap:     true,

Original file line number	Diff line number	Diff line change
`@@ -71,10 +71,11 @@ func getBranchDisplayStrings(`
`71`	`71`	`if showCommitHash {`
`72`	`72`	`availableWidth -= utils.COMMIT_HASH_SHORT_SIZE + 1`
`73`	`73`	`}`
	`74`	`+ paddingNeededForDivergence := availableWidth`
	`75`	`+`
`74`	`76`	`if checkedOutByWorkTree {`
`75`	`77`	`availableWidth -= utils.StringWidth(worktreeIcon) + 1`
`76`	`78`	`}`
`77`		`- paddingNeededForDivergence := availableWidth`
`78`	`79`
`79`	`80`	`if len(branchStatus) > 0 {`
`80`	`81`	`availableWidth -= utils.StringWidth(utils.Decolorise(branchStatus)) + 1`