go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-06-17 00:18:05 +02:00
Code Issues Releases Activity

do not show commit files of another parent as added to the patch

Browse Source
This commit is contained in:
Jesse Duffield
2021-03-31 22:46:42 +11:00
parent 54910fdb76
commit 7364525bf5
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/presentation/commit_files.go
View File

@ -8,7 +8,7 @@ import (
"github.com/jesseduffield/lazygit/pkg/utils"
)
func GetCommitFileLine(name string, diffName string, commitFile *models.CommitFile, patchManager *patch.PatchManager) string {
func GetCommitFileLine(name string, diffName string, commitFile *models.CommitFile, patchManager *patch.PatchManager, parent string) string {
yellow := color.New(color.FgYellow)
green := color.New(color.FgGreen)
defaultColor := color.New(theme.DefaultTextColor)
@ -22,7 +22,7 @@ func GetCommitFileLine(name string, diffName string, commitFile *models.CommitFi
if diffName == name {
colour = diffTerminalColor
} else if commitFile != nil {
status := patchManager.GetFileStatus(commitFile.Name)
status := patchManager.GetFileStatus(commitFile.Name, parent)
switch status {
case patch.UNSELECTED:
colour = defaultColor