summaryrefslogtreecommitdiffstats
path: root/pkg/commands/git.go
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2018-08-27 18:50:24 +1000
committerJesse Duffield <jessedduffield@gmail.com>2018-08-27 18:50:24 +1000
commita1c6adab59e742adc6d4207fecd41c7fd18ceeca (patch)
tree271a241834ac586141b6ff188fd7ac8c44681c4b /pkg/commands/git.go
parent540edc0c35e97393d9a01c927f7ac962bcbf6d37 (diff)
parente72d090c5c9e426d11bbcf74f3cf3a32de21d3f5 (diff)
Merge branch 'master' into feature/anonymous-reporting
Diffstat (limited to 'pkg/commands/git.go')
-rw-r--r--pkg/commands/git.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkg/commands/git.go b/pkg/commands/git.go
index 75de1fc70..09fe610c2 100644
--- a/pkg/commands/git.go
+++ b/pkg/commands/git.go
@@ -265,7 +265,7 @@ func (c *GitCommand) UsingGpg() bool {
func (c *GitCommand) Commit(g *gocui.Gui, message string) (*exec.Cmd, error) {
command := "git commit -m " + c.OSCommand.Quote(message)
if c.UsingGpg() {
- return c.OSCommand.PrepareSubProcess(c.OSCommand.Platform.shell, c.OSCommand.Platform.shellArg, command)
+ return c.OSCommand.PrepareSubProcess(c.OSCommand.Platform.shell, c.OSCommand.Platform.shellArg, command), nil
}
return nil, c.OSCommand.RunCommand(command)
}
@@ -391,12 +391,12 @@ func (c *GitCommand) Checkout(branch string, force bool) error {
// AddPatch prepares a subprocess for adding a patch by patch
// this will eventually be swapped out for a better solution inside the Gui
-func (c *GitCommand) AddPatch(filename string) (*exec.Cmd, error) {
+func (c *GitCommand) AddPatch(filename string) *exec.Cmd {
return c.OSCommand.PrepareSubProcess("git", "add", "--patch", filename)
}
// PrepareCommitSubProcess prepares a subprocess for `git commit`
-func (c *GitCommand) PrepareCommitSubProcess() (*exec.Cmd, error) {
+func (c *GitCommand) PrepareCommitSubProcess() *exec.Cmd {
return c.OSCommand.PrepareSubProcess("git", "commit")
}