fix: remote cloning issues (#969)

Author: mrexox

internal/config/skip_checker_test.go

@@ -11,7 +11,7 @@ import (
 
 type mockCmd struct{}
 
-func (mc mockCmd) WithoutEnvs() system.Command {
+func (mc mockCmd) WithoutEnvs(...string) system.Command {
 	return mc
 }
 

internal/git/command_executor.go

@@ -21,8 +21,8 @@ func NewExecutor(cmd system.Command) *CommandExecutor {
 	return &CommandExecutor{cmd: cmd}
 }
 
-func (c CommandExecutor) WithoutEnvs() CommandExecutor {
-	return CommandExecutor{cmd: c.cmd.WithoutEnvs(), root: c.root}
+func (c CommandExecutor) WithoutEnvs(envs ...string) CommandExecutor {
+	return CommandExecutor{cmd: c.cmd.WithoutEnvs(envs...), root: c.root}
 }
 
 // Cmd runs plain string command. Trims spaces around output.

internal/git/remote.go

@@ -66,7 +66,7 @@ func (r *Repository) updateRemote(path, ref string) error {
 	log.Debugf("Updating remote config repository: %s", path)
 
 	// This is overwriting ENVs for worktrees, otherwise it does not work.
-	git := r.Git.WithoutEnvs()
+	git := r.Git.WithoutEnvs("GIT_DIR", "GIT_INDEX_FILE")
 
 	if len(ref) != 0 {
 		_, err := git.Cmd([]string{
@@ -102,7 +102,7 @@ func (r *Repository) cloneRemote(dest, directoryName, url, ref string) error {
 	}
 	cmdClone = append(cmdClone, url, directoryName)
 
-	_, err := r.Git.WithoutEnvs().Cmd(cmdClone)
+	_, err := r.Git.WithoutEnvs("GIT_DIR", "GIT_INDEX_FILE").Cmd(cmdClone)
 	if err != nil {
 		return err
 	}

internal/git/repository_test.go

@@ -14,7 +14,7 @@ type gitCmd struct {
 	cases map[string]string
 }
 
-func (g gitCmd) WithoutEnvs() system.Command {
+func (g gitCmd) WithoutEnvs(...string) system.Command {
 	return g
 }
 

internal/lefthook/run_test.go

@@ -15,7 +15,7 @@ import (
 
 type gitCmd struct{}
 
-func (g gitCmd) WithoutEnvs() system.Command {
+func (g gitCmd) WithoutEnvs(...string) system.Command {
 	return g
 }
 

internal/lefthook/runner/runner_test.go

@@ -44,7 +44,7 @@ func (e cmd) RunWithContext(context.Context, []string, string, io.Reader, io.Wri
 	return nil
 }
 
-func (g *gitCmd) WithoutEnvs() system.Command {
+func (g *gitCmd) WithoutEnvs(...string) system.Command {
 	return g
 }
 

internal/system/system.go

@@ -6,27 +6,28 @@ import (
 	"io"
 	"os"
 	"os/exec"
+	"strings"
 
 	"github.com/evilmartians/lefthook/internal/log"
 )
 
 type osCmd struct {
-	noEnvs bool
+	excludeEnvs []string
 }
 
 var Cmd = osCmd{}
 
 type Command interface {
-	WithoutEnvs() Command
+	WithoutEnvs(...string) Command
 	Run([]string, string, io.Reader, io.Writer, io.Writer) error
 }
 
 type CommandWithContext interface {
 	RunWithContext(context.Context, []string, string, io.Reader, io.Writer, io.Writer) error
 }
 
-func (c osCmd) WithoutEnvs() Command {
-	c.noEnvs = true
+func (c osCmd) WithoutEnvs(envs ...string) Command {
+	c.excludeEnvs = envs
 	return c
 }
 
@@ -47,8 +48,18 @@ func (c osCmd) RunWithContext(
 	log.Debug("[lefthook] cmd:    ", command)
 
 	cmd := exec.CommandContext(ctx, command[0], command[1:]...)
-	if c.noEnvs {
-		cmd.Env = []string{"LEFTHOOK=0"}
+	if len(c.excludeEnvs) > 0 {
+	loop:
+		for _, env := range os.Environ() {
+			for _, noenv := range c.excludeEnvs {
+				if strings.HasPrefix(env, noenv) {
+					log.Debug("[lefthook] noenv ", env)
+					continue loop
+				}
+			}
+			cmd.Env = append(cmd.Env, env)
+		}
+		cmd.Env = append(cmd.Env, "LEFTHOOK=0")
 	} else {
 		cmd.Env = os.Environ()
 		cmd.Env = append(cmd.Env, "LEFTHOOK=0")