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

Fix staged renamed file with unstaged changes displays incorrectly in Files view #1408

Browse Source
This commit is contained in:
Ryooooooga 2021-08-16 20:05:59 +09:00
parent 6c415d1341
commit a553f7fb77
No known key found for this signature in database
GPG Key ID: 07CF200DFCC20C25
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/commands/loading_files.go
View File

@ -94,10 +94,11 @@ func (c *GitCommand) GitStatus(opts GitStatusOptions) ([]string, error) {
original := splitLines[i] original := splitLines[i]
if len(original) < 2 { if len(original) < 2 {
continue continue
} else if strings.HasPrefix(original, "R ") { } else if strings.HasPrefix(original, "R") {
// if a line starts with 'R' then the next line is the original file. // if a line starts with 'R' then the next line is the original file.
next := strings.TrimSpace(splitLines[i+1]) next := strings.TrimSpace(splitLines[i+1])
original = "R " + next + RENAME_SEPARATOR + strings.TrimPrefix(original, "R ") prefix := original[:3] // /^R. /
original = prefix + next + RENAME_SEPARATOR + strings.TrimPrefix(original, prefix)
i++ i++
} }
response = append(response, original) response = append(response, original)