fixup: inherit environment variables for git invocations

Author: NonLogicalDev

cmd/goprompt/cmdQuery.go

@@ -313,7 +313,6 @@ func cmdQueryRun(_ *cobra.Command, _ []string) error {
 		gitDir, _ := stringExec("git", "rev-parse", "--path-format=absolute", "--git-dir")
 
 		subTasks.Go(func(ctx context.Context) error {
-
 			headRef := ""
 			if cherryHeadB, _ := os.ReadFile(filepath.Join(gitDir, "CHERRY_PICK_HEAD")); len(cherryHeadB) > 0 {
 				headRef = trim(string(cherryHeadB))
@@ -472,3 +471,8 @@ func startPrinter() (func(), func(name string, value interface{})) {
 	printPart(_partPid, os.Getpid())
 	return printerStop, printPart
 }
+
+func jsonPart(d interface{}) string {
+	b, _ := json.Marshal(d)
+	return string(b)
+}

cmd/goprompt/utils.go

@@ -82,6 +82,7 @@ func stringExec(path string, args ...string) (string, error) {
 
 	out, err := shellout.New(ctx,
 		shellout.Args(path, args...),
+		shellout.EnvInherit(),
 		shellout.EnvSet(map[string]string{
 			"GIT_OPTIONAL_LOCKS": "0",
 		}),

pkg/shellout/cli.go

@@ -17,7 +17,7 @@ type Cmd struct {
 	stderr io.Writer
 	stdout io.Writer
 
-	env map[string]string
+	env []string
 
 	cmd *exec.Cmd
 }
@@ -53,7 +53,15 @@ func ArgsAddFN(fn func() (args []string)) Option {
 
 func EnvSet(env map[string]string) Option {
 	return func(ex *Cmd) {
-		ex.env = env
+		for k, v := range env {
+			ex.env = append(ex.env, fmt.Sprintf("%s=%s", k, v))
+		}
+	}
+}
+
+func EnvInherit() Option {
+	return func(ex *Cmd) {
+		ex.env = append(ex.env, os.Environ()...)
 	}
 }
 
@@ -116,9 +124,7 @@ func (ex *Cmd) Pipe(other *Cmd, tee bool) error {
 }
 
 func New(ctx context.Context, options ...Option) *Cmd {
-	ex := &Cmd{
-		env: map[string]string{},
-	}
+	ex := &Cmd{}
 	for _, opt := range options {
 		opt(ex)
 	}
@@ -127,10 +133,7 @@ func New(ctx context.Context, options ...Option) *Cmd {
 	cmd.Stdin = ex.stdin
 	cmd.Stdout = ex.stdout
 	cmd.Stderr = ex.stderr
-
-	for k, v := range ex.env {
-		cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", k, v))
-	}
+	cmd.Env = ex.env
 
 	ex.cmd = cmd