sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +03:00
Code Activity

Rename Name to Path in File and CommitFile

Browse Source 
Name was very confusing and misleading.
This commit is contained in:
Stefan Haller
2025-02-28 20:59:09 +01:00
parent 0b5504aa98
commit 2dfc3491bd
22 changed files with 217 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/filetree/file_node.go
View File

@ -51,7 +51,7 @@ func (self *FileNode) GetHasInlineMergeConflicts() bool {
if !file.HasInlineMergeConflicts {
return false
}
hasConflicts, _ := mergeconflicts.FileHasConflictMarkers(file.Name)
hasConflicts, _ := mergeconflicts.FileHasConflictMarkers(file.Path)
return hasConflicts
})
}
@ -69,5 +69,5 @@ func (self *FileNode) GetPreviousPath() string {
return ""
}
return self.File.PreviousName
return self.File.PreviousPath
}