go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-07 07:19:57 +02:00
Code Issues Releases Activity

add quotes around the git commit command on non-windows systems

Browse Source 
Signed-off-by: Randshot <randshot@norealm.xyz>
This commit is contained in:
Randshot 2020-07-13 15:22:19 +02:00 committed by Jesse Duffield
parent fe6d8d62c5
commit 39a2122dc0
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/commands/git.go
View File

@ -453,7 +453,15 @@ func (c *GitCommand) usingGpg() bool {
func (c *GitCommand) Commit(message string, flags string) (*exec.Cmd, error) {
command := fmt.Sprintf("git commit %s -m %s", flags, c.OSCommand.Quote(message))
if c.usingGpg() {
return c.OSCommand.ExecutableFromString(fmt.Sprintf("%s %s %s", c.OSCommand.Platform.shell, c.OSCommand.Platform.shellArg, command)), nil
quotedCommand := ""
// Windows does not seem to like quotes around the command
if c.OSCommand.Platform.os == "windows" {
quotedCommand = command
} else {
quotedCommand = c.OSCommand.Quote(command)
}
return c.OSCommand.ExecutableFromString(fmt.Sprintf("%s %s %s", c.OSCommand.Platform.shell, c.OSCommand.Platform.shellArg, quotedCommand)), nil
}
return nil, c.OSCommand.RunCommand(command)
@ -470,7 +478,15 @@ func (c *GitCommand) GetHeadCommitMessage() (string, error) {
func (c *GitCommand) AmendHead() (*exec.Cmd, error) {
command := "git commit --amend --no-edit --allow-empty"
if c.usingGpg() {
return c.OSCommand.ExecutableFromString(fmt.Sprintf("%s %s %s", c.OSCommand.Platform.shell, c.OSCommand.Platform.shellArg, command)), nil
quotedCommand := ""
// Windows does not seem to like quotes around the command
if c.OSCommand.Platform.os == "windows" {
quotedCommand = command
} else {
quotedCommand = c.OSCommand.Quote(command)
}
return c.OSCommand.ExecutableFromString(fmt.Sprintf("%s %s %s", c.OSCommand.Platform.shell, c.OSCommand.Platform.shellArg, quotedCommand)), nil
}
return nil, c.OSCommand.RunCommand(command)

4
pkg/commands/git_test.go
View File

@ -815,7 +815,7 @@ func TestGitCommandCommit(t *testing.T) {
"Commit using gpg",
func(cmd string, args ...string) *exec.Cmd {
assert.EqualValues(t, "bash", cmd)
assert.EqualValues(t, []string{"-c", "git", "commit", "-m", "test"}, args)
assert.EqualValues(t, []string{"-c", "git commit -m 'test'"}, args)
return exec.Command("echo")
},
@ -905,7 +905,7 @@ func TestGitCommandAmendHead(t *testing.T) {
"Amend commit using gpg",
func(cmd string, args ...string) *exec.Cmd {
assert.EqualValues(t, "bash", cmd)
assert.EqualValues(t, []string{"-c", "git", "commit", "--amend", "--no-edit", "--allow-empty"}, args)
assert.EqualValues(t, []string{"-c", "git commit --amend --no-edit --allow-empty"}, args)
return exec.Command("echo")
},