mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 12:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: fix diff of renamed files

Browse source
This commit is contained in:
Ryooooooga 2022-04-05 23:35:41 +09:00 • committed by Jesse Duffield
parent 954d1a8147
commit 53257db99d
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/commands/git_commands/working_tree.go
View file

@ -230,6 +230,7 @@ func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, plain
trackedArg := "--"
colorArg := self.UserConfig.Git.Paging.ColorArg
quotedPath := self.cmd.Quote(node.GetPath())
quotedPrevPath := ""
ignoreWhitespaceArg := ""
contextSize := self.UserConfig.Git.DiffContextSize
if cached {
@ -244,8 +245,11 @@ func (self *WorkingTreeCommands) WorktreeFileDiffCmdObj(node models.IFile, plain
if ignoreWhitespace {
ignoreWhitespaceArg = " --ignore-all-space"
}
if prevPath := node.GetPreviousPath(); prevPath != "" {
quotedPrevPath = " " + self.cmd.Quote(prevPath)
}
cmdStr := fmt.Sprintf("git diff --submodule --no-ext-diff --unified=%d --color=%s%s%s %s %s", contextSize, colorArg, ignoreWhitespaceArg, cachedArg, trackedArg, quotedPath)
cmdStr := fmt.Sprintf("git diff --submodule --no-ext-diff --unified=%d --color=%s%s%s %s %s%s", contextSize, colorArg, ignoreWhitespaceArg, cachedArg, trackedArg, quotedPath, quotedPrevPath)
return self.cmd.New(cmdStr).DontLog()
}

5
pkg/commands/models/file.go
View file

@ -27,6 +27,7 @@ type IFile interface {
GetHasStagedChanges() bool
GetIsTracked() bool
GetPath() string
GetPreviousPath() string
}
func (f *File) IsRename() bool {
@ -85,3 +86,7 @@ func (f *File) GetPath() string {
// TODO: remove concept of name; just use path
return f.Name
}
func (f *File) GetPreviousPath() string {
return f.PreviousName
}

7
pkg/gui/filetree/file_node.go
View file

@ -42,6 +42,13 @@ func (s *FileNode) GetPath() string {
return s.Path
}
func (s *FileNode) GetPreviousPath() string {
if s.File != nil {
return s.File.GetPreviousPath()
}
return ""
}
func (s *FileNode) GetChildren() []INode {
return slices.Map(s.Children, func(child *FileNode) INode {
return child