More logging for git stash pop

Author: Tobias Meinhardt

git/gogit_adapter.go

@@ -1,6 +1,7 @@
 package git
 
 import (
+	"bytes"
 	"os"
 	"path/filepath"
 	"strings"
@@ -123,8 +124,8 @@ func (a goGitAdapter) Stash() error {
 }
 
 // Pop all stashed changes
-func (a goGitAdapter) StashPop() error {
-	return errors.New("not implemented yet")
+func (a goGitAdapter) StashPop() (stdout, stderr bytes.Buffer, err error) {
+	return bytes.Buffer{}, bytes.Buffer{}, errors.New("not implemented yet")
 }
 
 // Commit added changes

git/logging.go

@@ -1,6 +1,7 @@
 package git
 
 import (
+	"bytes"
 	"time"
 
 	"github.com/go-kit/kit/log"
@@ -74,7 +75,7 @@ func (s loggingService) Stash() (err error) {
 }
 
 // Pop all stashed changes
-func (s loggingService) StashPop() (err error) {
+func (s loggingService) StashPop() (stdout, stderr bytes.Buffer, err error) {
 	defer func(begin time.Time) {
 		s.logger.Log("method", "StashPop", "took", time.Since(begin), "err", err)
 	}(time.Now())

git/native_adapter.go

@@ -99,12 +99,11 @@ func (a nativeGitAdapter) Stash() error {
 }
 
 // Pop all stashed changes
-func (a nativeGitAdapter) StashPop() error {
+func (a nativeGitAdapter) StashPop() (stdout, stderr bytes.Buffer, err error) {
 	cmd := a.exec.Command("git stash pop")
-	var stderr bytes.Buffer
+	cmd.Stdout = &stdout
 	cmd.Stderr = &stderr
-	err := cmd.Run()
-	return errors.Wrap(err, stderr.String())
+	return stdout, stderr, cmd.Run()
 }
 
 // Commit added changes

git/service.go

@@ -1,6 +1,8 @@
 package git
 
 import (
+	"bytes"
+
 	"github.com/meinto/glow"
 	"github.com/meinto/glow/cmd"
 )
@@ -14,7 +16,7 @@ type Service interface {
 	Fetch() error
 	AddAll() error
 	Stash() error
-	StashPop() error
+	StashPop() (stdout, stderr bytes.Buffer, err error)
 	Commit(message string) error
 	Push(setUpstream bool) error
 	Create(b glow.Branch, skipChecks bool) error

pkg/cli/cmd/push.go

@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"log"
+
 	"github.com/meinto/glow"
 	"github.com/meinto/glow/pkg/cli/cmd/util"
 	"github.com/spf13/cobra"
@@ -50,7 +52,9 @@ var pushCmd = &cobra.Command{
 			err = g.Checkout(currentBranch)
 			util.CheckForError(err, "Checkout")
 
-			err = g.StashPop()
+			stdout, stderr, err := g.StashPop()
+			log.Println(stdout.String())
+			log.Println(stderr.String())
 			util.CheckForError(err, "StashPop")
 
 			if pushCmdOptions.CommitMessage != "" {