GitCommand: Fix order of return values

I seem to be coding too much with node these days.

Author: vHanda

common/author.go

@@ -11,7 +11,7 @@ var errNoGitAuthorEmail = errors.New("Missing git author email")
 var errNoGitAuthorName = errors.New("Missing git author name")
 
 func ensureGitAuthor(repoPath string) error {
-	err, _ := GitCommand(repoPath, []string{"config", "user.email"})
+	_, err := GitCommand(repoPath, []string{"config", "user.email"})
 	if err != nil {
 		var exerr *exec.ExitError
 		if errors.As(err, &exerr) && exerr.ExitCode() == 1 {
@@ -20,7 +20,7 @@ func ensureGitAuthor(repoPath string) error {
 		return tracerr.Wrap(err)
 	}
 
-	err, _ = GitCommand(repoPath, []string{"config", "user.name"})
+	_, err = GitCommand(repoPath, []string{"config", "user.name"})
 	if err != nil {
 		var exerr *exec.ExitError
 		if errors.As(err, &exerr) && exerr.ExitCode() == 1 {

common/commit.go

@@ -9,28 +9,28 @@ import (
 )
 
 func commit(repoPath string) error {
-	err, outb := GitCommand(repoPath, []string{"status", "--porcelain"})
+	outb, err := GitCommand(repoPath, []string{"status", "--porcelain"})
 
 	if err == nil {
 		if len(outb.Bytes()) == 0 {
 			return nil
 		}
 	}
 
-	err, _ = GitCommand(repoPath, []string{"add", "--all"})
+	_, err = GitCommand(repoPath, []string{"add", "--all"})
 	if err != nil {
 		return tracerr.Wrap(err)
 	}
 
-	err, _ = GitCommand(repoPath, []string{"commit", "-m", outb.String()})
+	_, err = GitCommand(repoPath, []string{"commit", "-m", outb.String()})
 	if err != nil {
 		return tracerr.Wrap(err)
 	}
 
 	return nil
 }
 
-func GitCommand(repoPath string, args []string) (error, bytes.Buffer) {
+func GitCommand(repoPath string, args []string) (bytes.Buffer, error) {
 	var outb, errb bytes.Buffer
 
 	statusCmd := exec.Command("git", args...)
@@ -41,7 +41,8 @@ func GitCommand(repoPath string, args []string) (error, bytes.Buffer) {
 
 	if err != nil {
 		fullCmd := "git " + strings.Join(args, " ")
-		return tracerr.Errorf("%w: Command: %s\nStdOut: %s\nStdErr: %s", err, fullCmd, outb.String(), errb.String()), outb
+		err := tracerr.Errorf("%w: Command: %s\nStdOut: %s\nStdErr: %s", err, fullCmd, outb.String(), errb.String())
+		return outb, err
 	}
-	return nil, outb
+	return outb, nil
 }

common/fetch.go

@@ -19,7 +19,7 @@ func fetch(repoPath string) error {
 	for _, remote := range remotes {
 		remoteName := remote.Config().Name
 
-		err, _ := GitCommand(repoPath, []string{"fetch", remoteName})
+		_, err := GitCommand(repoPath, []string{"fetch", remoteName})
 		if err != nil {
 			return tracerr.Wrap(err)
 		}

common/push.go

@@ -14,7 +14,7 @@ func push(repoPath string) error {
 		return nil
 	}
 
-	err, _ = GitCommand(repoPath, []string{"push", bi.UpstreamRemote, bi.UpstreamBranch})
+	_, err = GitCommand(repoPath, []string{"push", bi.UpstreamRemote, bi.UpstreamBranch})
 	if err != nil {
 		return tracerr.Wrap(err)
 	}

common/rebase.go

@@ -19,7 +19,7 @@ func rebase(repoPath string) error {
 		return tracerr.Wrap(err)
 	}
 
-	rebaseErr, _ := GitCommand(repoPath, []string{"rebase", bi.UpstreamRemote + "/" + bi.UpstreamBranch})
+	_, rebaseErr := GitCommand(repoPath, []string{"rebase", bi.UpstreamRemote + "/" + bi.UpstreamBranch})
 	if rebaseErr != nil {
 		rebaseInProgress, err := isRebasing(repoPath)
 		if err != nil {
@@ -28,7 +28,7 @@ func rebase(repoPath string) error {
 
 		var exerr *exec.ExitError
 		if errors.As(rebaseErr, &exerr) && exerr.ExitCode() == 1 && rebaseInProgress {
-			err, _ := GitCommand(repoPath, []string{"rebase", "--abort"})
+			_, err := GitCommand(repoPath, []string{"rebase", "--abort"})
 			if err != nil {
 				return tracerr.Wrap(err)
 			}