jesseduffield/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2026-10-12 02:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't ignore a git error when listing the files of a commit's diff

Browse Source 
If git fails to list the files of the diff that a custom patch is
built from, we carry on as if the diff had no files. Then we don't
know which files were renamed, added or deleted, and build the patch
from the wrong lines or without the file's creation or deletion.

Return the error instead, so that the user sees it.

Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
This commit is contained in:
Stefan Haller
2026-10-10 13:04:41 +02:00
co-authored by Claude Opus 5.5
parent 6be2bd9031
commit e5eb4086c5
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/gui/controllers/commit_diff_actions.go
+22 -12
View File
@@ -104,7 +104,10 @@ func (self *CommitDiffActions) PrimaryAction(pane types.DiffPaneContext, firstBu
if len(lines) == 0 {
return nil
}
selection := self.selectionByFile(lines)
selection, err := self.selectionByFile(lines)
if err != nil {
return err
}
if len(selection.paths) == 0 {
return nil
}
@@ -171,7 +174,10 @@ func (self *CommitDiffActions) removePatchLines(
}
patchBuilder := self.c.Git().Patch.PatchBuilder
files := self.filesInDiff()
files, err := self.filesInDiff()
if err != nil {
return err
}
for path, ordinals := range self.c.Helpers().DiffLine.ChangeLineOrdinals(self.customPatchDiff(), lines) {
filename := self.patchBuilderPath(path)
if filename == "" {
@@ -229,7 +235,10 @@ func (self *CommitDiffActions) DiscardSelection(pane types.DiffPaneContext, firs
if commitIndex == -1 {
return nil
}
selection := self.selectionByFile(lines)
selection, err := self.selectionByFile(lines)
if err != nil {
return err
}
if len(selection.paths) == 0 {
return nil
}
@@ -341,11 +350,12 @@ type commitDiffSelection struct {
// selectionByFile groups the given lines of the commit's diff by the file they belong
// to. A line whose path is no file of this repo is left out.
func (self *CommitDiffActions) selectionByFile(lines []types.DiffLineInfo) commitDiffSelection {
selection := commitDiffSelection{
files: self.filesInDiff(),
linesByPath: map[string][]patch.LineIdentity{},
func (self *CommitDiffActions) selectionByFile(lines []types.DiffLineInfo) (commitDiffSelection, error) {
files, err := self.filesInDiff()
if err != nil {
return commitDiffSelection{}, err
}
selection := commitDiffSelection{files: files, linesByPath: map[string][]patch.LineIdentity{}}
for _, line := range lines {
path := self.patchBuilderPath(line.Path)
if path == "" {
@@ -356,7 +366,7 @@ func (self *CommitDiffActions) selectionByFile(lines []types.DiffLineInfo) commi
}
selection.linesByPath[path] = append(selection.linesByPath[path], line.PatchLineIdentity())
}
return selection
return selection, nil
}
// togglePatchLines takes the selected lines of the commit's diff into the custom patch,
@@ -438,20 +448,20 @@ func (self commitDiffFiles) isWholeFileOperation(path string) bool {
// filesInDiff asks git which files the diff a patch is being built from covers, and
// what it does to each.
func (self *CommitDiffActions) filesInDiff() commitDiffFiles {
func (self *CommitDiffActions) filesInDiff() (commitDiffFiles, error) {
target := self.target()
if target == nil {
return nil
return nil, nil
}
from, reverse := self.patchEndpoints(target)
files, err := self.c.Git().Loaders.CommitFileLoader.GetFilesInDiff(from, target.to, reverse)
if err != nil {
return nil
return nil, err
}
return lo.SliceToMap(files, func(file *models.CommitFile) (string, *models.CommitFile) {
return file.Path, file
})
}), nil
}
// patchEndpoints gives the two ends of the diff a patch is built from. They are the ends