cleanup git commands

Author: faza

cmd/git-gitopia/lfs/init.go

@@ -3,8 +3,8 @@ package lfs
 import (
 	"context"
 	"fmt"
-	"io"
 	"os"
+	"os/exec"
 	"path"
 	"strings"
 
@@ -31,22 +31,13 @@ var initCmd = &cobra.Command{
 
 		lfsConfigPath := path.Join(dir, ".lfsconfig")
 		if _, err := os.Stat(lfsConfigPath); os.IsNotExist(err) {
-			c, buf := core.GitCommand("git", "remote", "get-url", args[0])
-			if err := c.Start(); err != nil {
-				return err
-			}
-
-			output, err := io.ReadAll(buf)
+			c := exec.Command("git", "remote", "get-url", args[0])
+			output, err := c.Output()
 			if err != nil {
-				return err
-			}
-
-			if err := c.Wait(); err != nil {
-				return err
+				return errors.Wrap(err, "error reading the remote url")
 			}
 
 			remoteURL := strings.TrimSpace(string(output))
-
 			remoteUserId, remoteRepositoryName, err := core.ValidateGitopiaRemoteURL(string(remoteURL))
 			if err != nil {
 				return err
@@ -77,14 +68,10 @@ var initCmd = &cobra.Command{
 			remoteRepository := *res.Repository
 			lfsURL := fmt.Sprintf("%v/%v.git", config.GitServerHost, remoteRepository.Id)
 
-			args := []string{
-				"config",
+			cmd := core.GitCommand("git", "config",
 				fmt.Sprintf("--file=%s", lfsConfigPath),
 				"lfs.url",
-				lfsURL,
-			}
-
-			cmd, _ := core.GitCommand("git", args...)
+				lfsURL)
 			if err := cmd.Run(); err != nil {
 				return errors.Wrap(err, "error creating .lfsconfig")
 			}

cmd/git-remote-gitopia/gitopia.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/base64"
 	"fmt"
-	"io"
 	"math"
 	"os"
 	"strings"
@@ -137,14 +136,10 @@ func (h *GitopiaHandler) Fetch(remote *core.Remote, refsToFetch []core.RefToFetc
 		for _, ref := range refsToFetch {
 			args = append(args, ref.Ref)
 		}
-		cmd, outPipe := core.GitCommand("git", args...)
-		if err := cmd.Start(); err != nil {
-			out, e := io.ReadAll(outPipe)
-			return errors.Wrapf(err, `error fetching from remote repository. 
-			output %s, output read error %s`, string(out), e.Error())
+		cmd := core.GitCommand("git", args...)
+		if err := cmd.Run(); err != nil {
+			return errors.Wrap(err, "error fetching from remote repository")
 		}
-		defer core.CleanUpProcessGroup(cmd)
-		cmd.Wait()
 
 		return nil
 	}
@@ -165,14 +160,10 @@ func (h *GitopiaHandler) Fetch(remote *core.Remote, refsToFetch []core.RefToFetc
 		if force {
 			args = append(args, "--force")
 		}
-		cmd, outPipe := core.GitCommand("git", args...)
-		if err := cmd.Start(); err != nil {
-			out, e := io.ReadAll(outPipe)
-			return errors.Wrapf(err, `error fetching from remote repository. 
-		output %s, output read error %s`, string(out), e.Error())
+		cmd := core.GitCommand("git", args...)
+		if err := cmd.Run(); err != nil {
+			return errors.Wrap(err, "error fetching from remote repository")
 		}
-		defer core.CleanUpProcessGroup(cmd)
-		cmd.Wait()
 	}
 
 	return nil
@@ -270,11 +261,10 @@ func (h *GitopiaHandler) Push(remote *core.Remote, refsToPush []core.RefToPush)
 		if force {
 			args = append(args, "--force")
 		}
-		cmd, _ := core.GitCommand("git", args...)
+		cmd := core.GitCommand("git", args...)
 		if err := cmd.Run(); err != nil {
 			return nil, errors.Wrap(err, "error pushing to remote repository")
 		}
-		defer core.CleanUpProcessGroup(cmd)
 
 		// Update ref on gitopia
 		if strings.HasPrefix(ref.Local, branchPrefix) {

core/util.go

@@ -2,7 +2,6 @@ package core
 
 import (
 	"errors"
-	"io"
 	"os"
 	"os/exec"
 	"path"
@@ -30,13 +29,13 @@ func GetLocalDir() (string, error) {
 	return localdir, nil
 }
 
-func GitCommand(name string, args ...string) (*exec.Cmd, io.Reader) {
+func GitCommand(name string, args ...string) *exec.Cmd {
 	cmd := exec.Command(name, args...)
 	cmd.Env = os.Environ()
-
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
-	return cmd, nil
+
+	return cmd
 }
 
 func CleanUpProcessGroup(cmd *exec.Cmd) {