diff options
Diffstat (limited to 'pkg')
-rw-r--r-- | pkg/commands/git.go | 4 | ||||
-rw-r--r-- | pkg/commands/git_test.go | 81 | ||||
-rw-r--r-- | pkg/gui/files_panel.go | 2 |
3 files changed, 78 insertions, 9 deletions
diff --git a/pkg/commands/git.go b/pkg/commands/git.go index ffaf9fce6..0e974b567 100644 --- a/pkg/commands/git.go +++ b/pkg/commands/git.go @@ -317,9 +317,9 @@ func (c *GitCommand) usingGpg() bool { func (c *GitCommand) Commit(message string, amend bool) (*exec.Cmd, error) { amendParam := "" if amend { - amendParam = "--amend" + amendParam = " --amend" } - command := fmt.Sprintf("git commit %s -m %s", amendParam, c.OSCommand.Quote(message)) + command := fmt.Sprintf("git commit%s -m %s", amendParam, c.OSCommand.Quote(message)) if c.usingGpg() { return c.OSCommand.PrepareSubProcess(c.OSCommand.Platform.shell, c.OSCommand.Platform.shellArg, command), nil } diff --git a/pkg/commands/git_test.go b/pkg/commands/git_test.go index 25820558a..ebb9de136 100644 --- a/pkg/commands/git_test.go +++ b/pkg/commands/git_test.go @@ -561,7 +561,7 @@ func TestGitCommandUpstreamDifferentCount(t *testing.T) { { "Can't retrieve pullable count", func(cmd string, args ...string) *exec.Cmd { - if args[1] == "head..@{u}" { + if args[1] == "HEAD..@{u}" { return exec.Command("test") } @@ -575,7 +575,7 @@ func TestGitCommandUpstreamDifferentCount(t *testing.T) { { "Retrieve pullable and pushable count", func(cmd string, args ...string) *exec.Cmd { - if args[1] == "head..@{u}" { + if args[1] == "HEAD..@{u}" { return exec.Command("echo", "10") } @@ -889,7 +889,76 @@ func TestGitCommandCommit(t *testing.T) { gitCmd := newDummyGitCommand() gitCmd.getGlobalGitConfig = s.getGlobalGitConfig gitCmd.OSCommand.command = s.command - s.test(gitCmd.Commit("test")) + s.test(gitCmd.Commit("test", false)) + }) + } +} + +func TestGitCommandCommitAmendFromFiles(t *testing.T) { + type scenario struct { + testName string + command func(string, ...string) *exec.Cmd + getGlobalGitConfig func(string) (string, error) + test func(*exec.Cmd, error) + } + + scenarios := []scenario{ + { + "Amend commit using gpg", + func(cmd string, args ...string) *exec.Cmd { + assert.EqualValues(t, "bash", cmd) + assert.EqualValues(t, []string{"-c", `git commit --amend -m 'test'`}, args) + + return exec.Command("echo") + }, + func(string) (string, error) { + return "true", nil + }, + func(cmd *exec.Cmd, err error) { + assert.NotNil(t, cmd) + assert.Nil(t, err) + }, + }, + { + "Amend commit without using gpg", + func(cmd string, args ...string) *exec.Cmd { + assert.EqualValues(t, "git", cmd) + assert.EqualValues(t, []string{"commit", "--amend", "-m", "test"}, args) + + return exec.Command("echo") + }, + func(string) (string, error) { + return "false", nil + }, + func(cmd *exec.Cmd, err error) { + assert.Nil(t, cmd) + assert.Nil(t, err) + }, + }, + { + "Amend commit without using gpg with an error", + func(cmd string, args ...string) *exec.Cmd { + assert.EqualValues(t, "git", cmd) + assert.EqualValues(t, []string{"commit", "--amend", "-m", "test"}, args) + + return exec.Command("test") + }, + func(string) (string, error) { + return "false", nil + }, + func(cmd *exec.Cmd, err error) { + assert.Nil(t, cmd) + assert.Error(t, err) + }, + }, + } + + for _, s := range scenarios { + t.Run(s.testName, func(t *testing.T) { + gitCmd := newDummyGitCommand() + gitCmd.getGlobalGitConfig = s.getGlobalGitConfig + gitCmd.OSCommand.command = s.command + s.test(gitCmd.Commit("test", true)) }) } } @@ -1507,7 +1576,7 @@ func TestGitCommandGetCommits(t *testing.T) { switch args[0] { case "rev-list": - assert.EqualValues(t, []string{"rev-list", "@{u}..head", "--abbrev-commit"}, args) + assert.EqualValues(t, []string{"rev-list", "@{u}..HEAD", "--abbrev-commit"}, args) return exec.Command("echo") case "log": assert.EqualValues(t, []string{"log", "--oneline", "-30"}, args) @@ -1534,7 +1603,7 @@ func TestGitCommandGetCommits(t *testing.T) { switch args[0] { case "rev-list": - assert.EqualValues(t, []string{"rev-list", "@{u}..head", "--abbrev-commit"}, args) + assert.EqualValues(t, []string{"rev-list", "@{u}..HEAD", "--abbrev-commit"}, args) return exec.Command("echo", "8a2bb0e") case "log": assert.EqualValues(t, []string{"log", "--oneline", "-30"}, args) @@ -1577,7 +1646,7 @@ func TestGitCommandGetCommits(t *testing.T) { switch args[0] { case "rev-list": - assert.EqualValues(t, []string{"rev-list", "@{u}..head", "--abbrev-commit"}, args) + assert.EqualValues(t, []string{"rev-list", "@{u}..HEAD", "--abbrev-commit"}, args) return exec.Command("echo", "8a2bb0e") case "log": assert.EqualValues(t, []string{"log", "--oneline", "-30"}, args) diff --git a/pkg/gui/files_panel.go b/pkg/gui/files_panel.go index 19d7b9342..a00bd2843 100644 --- a/pkg/gui/files_panel.go +++ b/pkg/gui/files_panel.go @@ -226,7 +226,7 @@ func (gui *Gui) handleAmendCommitPress(g *gocui.Gui, filesView *gocui.View) erro lastCommitMsg := gui.State.Commits[0].Name _, err := gui.GitCommand.Commit(lastCommitMsg, true) if err != nil { - gui.createErrorPanel(g, err.Error()) + return gui.createErrorPanel(g, err.Error()) } return gui.refreshSidePanels(g) |