hacking

thockin · Jun 9, 2024 · 59b002f · 59b002f
1 parent 12a7d9c
commit 59b002f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3,059 deletions.
diff --git a/_test_tools/sshd/Dockerfile b/_test_tools/sshd/Dockerfile
@@ -49,6 +49,7 @@ VOLUME /dot_ssh
 
 # Callers should mount a directory with git repos here.
 VOLUME /git
+RUN git config --global safe.directory '*'
 
 # Callers can SSH as user "test"
 RUN echo "test:x:65533:65533::/home/test:/usr/bin/git-shell" >> /etc/passwd

diff --git a/main.go b/main.go
@@ -830,6 +830,9 @@ func main() {
 			updateSyncMetrics(metricKeyError, start)
 			if *flMaxFailures >= 0 && failCount >= *flMaxFailures {
 				// Exit after too many retries, maybe the error is not recoverable.
+				git.run.WithCallDepth(1).Run(ctx, git.root.String(), nil, "ls", "-lran")
+				git.run.WithCallDepth(1).Run(ctx, git.root.String(), nil, "git", "config", "--get", "safe.directory")
+				git.run.WithCallDepth(1).Run(ctx, git.root.String(), nil, "git", "config", "--list")
 				log.Error(err, "too many failures, aborting", "failCount", failCount)
 				os.Exit(1)
 			}

diff --git a/pkg/cmd/cmd.go b/pkg/cmd/cmd.go
@@ -84,6 +84,7 @@ func runWithStdin(ctx context.Context, log logintf, cwd string, env []string, st
 		return stdout, stderr, fmt.Errorf("Run(%s): %w: { stdout: %q, stderr: %q }", cmdStr, ctx.Err(), stdout, stderr)
 	}
 	if err != nil {
+		log.V(6).Error(err, "command result", "stdout", stdout, "stderr", stderr, "time", wallTime)
 		return stdout, stderr, fmt.Errorf("Run(%s): %w: { stdout: %q, stderr: %q }", cmdStr, err, stdout, stderr)
 	}
 	log.V(6).Info("command result", "stdout", stdout, "stderr", stderr, "time", wallTime)