go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-06 03:53:59 +02:00
Code Issues Releases Activity

Fix staging/unstaging files containing " in paths

Browse Source
This commit is contained in:
Ryooooooga 2021-03-02 12:15:25 +09:00 committed by Jesse Duffield
parent e5ba0d9d9c
commit 64daf1310d
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/commands/loading_files.go
View File

@ -37,7 +37,7 @@ func (c *GitCommand) GetStatusFiles(opts GetStatusFileOptions) []*models.File {
change := statusString[0:2] change := statusString[0:2]
stagedChange := change[0:1] stagedChange := change[0:1]
unstagedChange := statusString[1:2] unstagedChange := statusString[1:2]
filename := c.OSCommand.Unquote(statusString[3:]) filename := statusString[3:]
untracked := utils.IncludesString([]string{"??", "A ", "AM"}, change) untracked := utils.IncludesString([]string{"??", "A ", "AM"}, change)
hasNoStagedChanges := utils.IncludesString([]string{" ", "U", "?"}, stagedChange) hasNoStagedChanges := utils.IncludesString([]string{" ", "U", "?"}, stagedChange)
hasMergeConflicts := utils.IncludesString([]string{"DD", "AA", "UU", "AU", "UA", "UD", "DU"}, change) hasMergeConflicts := utils.IncludesString([]string{"DD", "AA", "UU", "AU", "UA", "UD", "DU"}, change)

6
pkg/commands/oscommands/os.go
View File

@ -256,12 +256,6 @@ func (c *OSCommand) Quote(message string) string {
return escapedQuote + message + escapedQuote return escapedQuote + message + escapedQuote
} }
// Unquote removes wrapping quotations marks if they are present
// this is needed for removing quotes from staged filenames with spaces
func (c *OSCommand) Unquote(message string) string {
return strings.Replace(message, `"`, "", -1)
}
// AppendLineToFile adds a new line in file // AppendLineToFile adds a new line in file
func (c *OSCommand) AppendLineToFile(filename, line string) error { func (c *OSCommand) AppendLineToFile(filename, line string) error {
f, err := os.OpenFile(filename, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600) f, err := os.OpenFile(filename, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)

11
pkg/commands/oscommands/os_test.go
View File

@ -162,17 +162,6 @@ func TestOSCommandQuoteWindows(t *testing.T) {
assert.EqualValues(t, expected, actual) assert.EqualValues(t, expected, actual)
} }
// TestOSCommandUnquote is a function.
func TestOSCommandUnquote(t *testing.T) {
osCommand := NewDummyOSCommand()
actual := osCommand.Unquote(`hello "test"`)
expected := "hello test"
assert.EqualValues(t, expected, actual)
}
// TestOSCommandFileType is a function. // TestOSCommandFileType is a function.
func TestOSCommandFileType(t *testing.T) { func TestOSCommandFileType(t *testing.T) {
type scenario struct { type scenario struct {