Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ go-build:
go build -ldflags "-X github.com/fullsend-ai/fullsend/internal/cli.version=$(VERSION)" -o bin/fullsend ./cmd/fullsend/

go-test:
GH_TOKEN= GITHUB_TOKEN= go test -race -cover ./...
GH_TOKEN= GITHUB_TOKEN= \
GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0=commit.gpgsign GIT_CONFIG_VALUE_0=false \
go test -race -cover ./...

go-lint:
golangci-lint run ./...
Expand Down
1 change: 1 addition & 0 deletions eval/scripts/setup-fixture.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ GH_CRED_HELPER='!f(){ echo "password=${GH_TOKEN}"; };f'
git -c "credential.helper=${GH_CRED_HELPER}" \
clone "https://x-access-token@github.com/${EPHEMERAL_REPO}.git" "$TARGET_DIR"
git -C "$TARGET_DIR" config credential.helper "${GH_CRED_HELPER}"
git -C "$TARGET_DIR" config commit.gpgsign false

if [[ -d "${CASE_SOURCE_DIR}/repo" ]]; then
cp -a "${CASE_SOURCE_DIR}/repo/." "$TARGET_DIR/"
Expand Down
45 changes: 21 additions & 24 deletions internal/gitfetch/gitfetch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,20 @@ import (
"time"
)

// testGitEnv returns environment variables for ephemeral test repos,
// including signing disable so global gitsign/gpgsign config is not invoked.
func testGitEnv() []string {
return []string{
"GIT_AUTHOR_NAME=test",
"GIT_AUTHOR_EMAIL=test@test.com",
"GIT_COMMITTER_NAME=test",
"GIT_COMMITTER_EMAIL=test@test.com",
"GIT_CONFIG_COUNT=1",
"GIT_CONFIG_KEY_0=commit.gpgsign",
"GIT_CONFIG_VALUE_0=false",
}
Comment thread
ifireball marked this conversation as resolved.
Resolved
}

// createTestRepo creates a git repo in a temp dir with the given files,
// commits them, and returns the file:// URL and commit SHA.
func createTestRepo(t *testing.T, files map[string]string) (repoURL, commitSHA string) {
Expand All @@ -29,12 +43,7 @@ func createTestRepo(t *testing.T, files map[string]string) (repoURL, commitSHA s
t.Helper()
cmd := exec.Command("git", args...)
cmd.Dir = dir
cmd.Env = append(os.Environ(),
"GIT_AUTHOR_NAME=test",
"GIT_AUTHOR_EMAIL=test@test.com",
"GIT_COMMITTER_NAME=test",
"GIT_COMMITTER_EMAIL=test@test.com",
)
cmd.Env = append(os.Environ(), testGitEnv()...)
out, err := cmd.CombinedOutput()
if err != nil {
t.Fatalf("git %s failed: %v\n%s", strings.Join(args, " "), err, out)
Expand All @@ -43,6 +52,7 @@ func createTestRepo(t *testing.T, files map[string]string) (repoURL, commitSHA s
}

run("init", "-b", "main")
run("config", "commit.gpgsign", "false")

for path, content := range files {
full := filepath.Join(dir, filepath.FromSlash(path))
Expand Down Expand Up @@ -153,12 +163,7 @@ func TestFetchTree_TagRef(t *testing.T) {
t.Helper()
cmd := exec.Command("git", args...)
cmd.Dir = dir
cmd.Env = append(os.Environ(),
"GIT_AUTHOR_NAME=test",
"GIT_AUTHOR_EMAIL=test@test.com",
"GIT_COMMITTER_NAME=test",
"GIT_COMMITTER_EMAIL=test@test.com",
)
cmd.Env = append(os.Environ(), testGitEnv()...)
if out, err := cmd.CombinedOutput(); err != nil {
t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
}
Expand Down Expand Up @@ -428,18 +433,14 @@ func TestFetchTree_SymlinkRejected(t *testing.T) {
t.Helper()
cmd := exec.Command("git", args...)
cmd.Dir = dir
cmd.Env = append(os.Environ(),
"GIT_AUTHOR_NAME=test",
"GIT_AUTHOR_EMAIL=test@test.com",
"GIT_COMMITTER_NAME=test",
"GIT_COMMITTER_EMAIL=test@test.com",
)
cmd.Env = append(os.Environ(), testGitEnv()...)
if out, err := cmd.CombinedOutput(); err != nil {
t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
}
}

run("init", "-b", "main")
run("config", "commit.gpgsign", "false")

skillDir := filepath.Join(dir, "skills", "evil")
if err := os.MkdirAll(skillDir, 0o755); err != nil {
Expand Down Expand Up @@ -612,12 +613,7 @@ func TestFetchTree_AuthFallbackHTTP(t *testing.T) {
t.Helper()
cmd := exec.Command("git", args...)
cmd.Dir = dir
cmd.Env = append(os.Environ(),
"GIT_AUTHOR_NAME=test",
"GIT_AUTHOR_EMAIL=test@test.com",
"GIT_COMMITTER_NAME=test",
"GIT_COMMITTER_EMAIL=test@test.com",
)
cmd.Env = append(os.Environ(), testGitEnv()...)
if out, err := cmd.CombinedOutput(); err != nil {
t.Fatalf("git %s: %v\n%s", strings.Join(args, " "), err, out)
}
Expand All @@ -631,6 +627,7 @@ func TestFetchTree_AuthFallbackHTTP(t *testing.T) {
workDir := t.TempDir()
gitCmd(workDir, "clone", bareDir, "work")
work := filepath.Join(workDir, "work")
gitCmd(work, "config", "commit.gpgsign", "false")
skillDir := filepath.Join(work, "skills", "review")
if err := os.MkdirAll(skillDir, 0o755); err != nil {
t.Fatal(err)
Expand Down
Loading