Skip to content

[cleanup]Standardize git test repository setup #1390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Soph merged 2 commits into from
Jun 15, 2026
Merged

[cleanup]Standardize git test repository setup #1390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc0714d
Stabilize git-backed tests with shared repo setup
stale2000 Jun 9, 2026
c009408
Merge branch 'main' into codex/standardize-git-test-setup
Soph Jun 15, 2026
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
6 changes: 4 additions & 2 deletions cmd/entire/cli/checkpoint/backwards_compat_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

"github.com/entireio/cli/cmd/entire/cli/agent"
"github.com/entireio/cli/cmd/entire/cli/checkpoint/id"
"github.com/entireio/cli/cmd/entire/cli/testutil"
"github.com/entireio/cli/redact"

"github.com/go-git/go-git/v6"
Expand All @@ -25,9 +26,10 @@ import (
func TestReadCommitted_MissingTokenUsage(t *testing.T) {
tempDir := t.TempDir()

repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

worktree, err := repo.Worktree()
Expand Down
115 changes: 69 additions & 46 deletions cmd/entire/cli/checkpoint/checkpoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ func TestCopyMetadataDir_SkipsSymlinks(t *testing.T) {
tempDir := t.TempDir()

// Initialize a git repository
repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

// Create metadata directory structure
Expand Down Expand Up @@ -108,9 +109,10 @@ func TestWriteCommitted_AgentField(t *testing.T) {
tempDir := t.TempDir()

// Initialize a git repository with an initial commit
repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

// Create worktree and make initial commit
Expand Down Expand Up @@ -299,9 +301,10 @@ func TestWriteTemporary_Deduplication(t *testing.T) {
tempDir := t.TempDir()

// Initialize a git repository with an initial commit
repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

// Create worktree and make initial commit
Expand Down Expand Up @@ -423,9 +426,10 @@ func setupBranchTestRepo(t *testing.T) (*git.Repository, plumbing.Hash) {
t.Helper()
tempDir := t.TempDir()

repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

worktree, err := repo.Worktree()
Expand Down Expand Up @@ -846,9 +850,10 @@ func TestUpdateSummary_NotFound(t *testing.T) {
func TestListCommitted_FallsBackToRemote(t *testing.T) {
// Create "remote" repo (non-bare, so we can make commits)
remoteDir := t.TempDir()
remoteRepo, err := git.PlainInit(remoteDir, false)
testutil.InitRepo(t, remoteDir)
remoteRepo, err := git.PlainOpen(remoteDir)
if err != nil {
t.Fatalf("failed to init remote repo: %v", err)
t.Fatalf("failed to open remote repo: %v", err)
}

// Create an initial commit on main branch (required for cloning)
Expand Down Expand Up @@ -993,9 +998,10 @@ func TestGetCheckpointAuthor_NotFound(t *testing.T) {
func TestGetCheckpointAuthor_NoSessionsBranch(t *testing.T) {
// Create a fresh repo without sessions branch
tempDir := t.TempDir()
repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

store := NewGitStore(repo, DefaultV1Refs())
Expand Down Expand Up @@ -1746,9 +1752,10 @@ func TestWriteTemporary_FirstCheckpoint_CapturesModifiedTrackedFiles(t *testing.
tempDir := t.TempDir()

// Initialize a git repository with an initial commit containing README.md
repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

worktree, err := repo.Worktree()
Expand Down Expand Up @@ -1883,9 +1890,10 @@ func TestWriteTemporary_PathNormalizationAndSkipping(t *testing.T) {
t.Fatalf("failed to resolve symlinks: %v", err)
}

repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

worktree, err := repo.Worktree()
Expand Down Expand Up @@ -1976,9 +1984,10 @@ func TestWriteTemporary_FirstCheckpoint_CapturesUntrackedFiles(t *testing.T) {
tempDir := t.TempDir()

// Initialize a git repository with an initial commit
repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

worktree, err := repo.Worktree()
Expand Down Expand Up @@ -2073,9 +2082,10 @@ func TestWriteTemporary_FirstCheckpoint_ExcludesGitIgnoredFiles(t *testing.T) {
tempDir := t.TempDir()

// Initialize a git repository with an initial commit
repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

worktree, err := repo.Worktree()
Expand Down Expand Up @@ -2528,9 +2538,10 @@ func TestWriteTemporary_FirstCheckpoint_UserAndAgentChanges(t *testing.T) {
tempDir := t.TempDir()

// Initialize a git repository with an initial commit
repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

worktree, err := repo.Worktree()
Expand Down Expand Up @@ -2647,9 +2658,10 @@ func TestWriteTemporary_FirstCheckpoint_CapturesUserDeletedFiles(t *testing.T) {
tempDir := t.TempDir()

// Initialize a git repository with an initial commit
repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

worktree, err := repo.Worktree()
Expand Down Expand Up @@ -2749,9 +2761,10 @@ func TestWriteTemporary_FirstCheckpoint_CapturesRenamedFiles(t *testing.T) {
tempDir := t.TempDir()

// Initialize a git repository with an initial commit
repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

worktree, err := repo.Worktree()
Expand Down Expand Up @@ -2847,9 +2860,10 @@ func TestWriteTemporary_FirstCheckpoint_FilenamesWithSpaces(t *testing.T) {
tempDir := t.TempDir()

// Initialize a git repository with an initial commit
repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

worktree, err := repo.Worktree()
Expand Down Expand Up @@ -3384,9 +3398,10 @@ func TestWriteCommitted_RedactsPromptSecrets(t *testing.T) {
func TestCopyMetadataDir_RedactsSecrets(t *testing.T) {
tempDir := t.TempDir()

repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

metadataDir := filepath.Join(tempDir, "metadata")
Expand Down Expand Up @@ -3454,9 +3469,10 @@ func TestWriteCommitted_CLIVersionField(t *testing.T) {

tempDir := t.TempDir()

repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

worktree, err := repo.Worktree()
Expand Down Expand Up @@ -3567,9 +3583,10 @@ func TestWriteCommitted_ModelFieldAlwaysPresent(t *testing.T) {

tempDir := t.TempDir()

repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

worktree, err := repo.Worktree()
Expand Down Expand Up @@ -3965,9 +3982,10 @@ func TestWriteTemporaryTask_SubagentTranscript_RedactsSecrets(t *testing.T) {
tempDir := t.TempDir()

// Initialize a git repository with an initial commit
repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}
worktree, err := repo.Worktree()
if err != nil {
Expand Down Expand Up @@ -4056,9 +4074,10 @@ func TestAddDirectoryToEntries_PathTraversal(t *testing.T) {
t.Parallel()
tempDir := t.TempDir()

repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

// Create a directory structure where the relative path could escape
Expand Down Expand Up @@ -4091,9 +4110,10 @@ func TestAddDirectoryToEntries_SkipsSymlinks(t *testing.T) {
t.Parallel()
tempDir := t.TempDir()

repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

// Create metadata directory
Expand Down Expand Up @@ -4145,9 +4165,10 @@ func TestAddDirectoryToEntries_SkipsSymlinkedDirectories(t *testing.T) {
t.Parallel()
tempDir := t.TempDir()

repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

// Create metadata directory with a regular file
Expand Down Expand Up @@ -4203,9 +4224,10 @@ func TestAddDirectoryToEntries_SkipsSymlinkedDirectories(t *testing.T) {
func TestWriteTemporaryTask_ExcludesGitIgnoredFiles(t *testing.T) {
tempDir := t.TempDir()

repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

worktree, err := repo.Worktree()
Expand Down Expand Up @@ -4522,9 +4544,10 @@ func readSessionMetadataAtIndex(t *testing.T, repo *git.Repository, checkpointID
func initRepoForCheckpointTest(t *testing.T) *git.Repository {
t.Helper()
tempDir := t.TempDir()
repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("init git repo: %v", err)
t.Fatalf("open git repo: %v", err)
}
worktree, err := repo.Worktree()
if err != nil {
Expand Down
6 changes: 4 additions & 2 deletions cmd/entire/cli/checkpoint/committed_tripwire_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/entireio/cli/cmd/entire/cli/jsonutil"
"github.com/entireio/cli/cmd/entire/cli/logging"
"github.com/entireio/cli/cmd/entire/cli/paths"
"github.com/entireio/cli/cmd/entire/cli/testutil"
"github.com/entireio/cli/cmd/entire/cli/versioninfo"
"github.com/entireio/cli/redact"

Expand All @@ -21,9 +22,10 @@ func TestWriteStandardCheckpointEntries_RefusesUnexpectedSessionZeroOverwrite(t
tmpDir := t.TempDir()
t.Chdir(tmpDir)

repo, err := git.PlainInit(tmpDir, false)
testutil.InitRepo(t, tmpDir)
repo, err := git.PlainOpen(tmpDir)
if err != nil {
t.Fatalf("PlainInit() error = %v", err)
t.Fatalf("PlainOpen() error = %v", err)
}
store := NewGitStore(repo, DefaultV1Refs())

Expand Down
6 changes: 4 additions & 2 deletions cmd/entire/cli/checkpoint/committed_update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/entireio/cli/cmd/entire/cli/agent/types"
"github.com/entireio/cli/cmd/entire/cli/checkpoint/id"
"github.com/entireio/cli/cmd/entire/cli/paths"
"github.com/entireio/cli/cmd/entire/cli/testutil"
"github.com/entireio/cli/redact"

"github.com/go-git/go-git/v6"
Expand All @@ -23,9 +24,10 @@ func setupRepoForUpdate(t *testing.T) (*git.Repository, *GitStore, id.Checkpoint
t.Helper()

tempDir := t.TempDir()
repo, err := git.PlainInit(tempDir, false)
testutil.InitRepo(t, tempDir)
repo, err := git.PlainOpen(tempDir)
if err != nil {
t.Fatalf("failed to init git repo: %v", err)
t.Fatalf("failed to open git repo: %v", err)
}

worktree, err := repo.Worktree()
Expand Down
6 changes: 4 additions & 2 deletions cmd/entire/cli/checkpoint/tree_surgery_equiv_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"strings"
"testing"

"github.com/entireio/cli/cmd/entire/cli/testutil"
gogit "github.com/go-git/go-git/v6"
"github.com/go-git/go-git/v6/plumbing"
"github.com/go-git/go-git/v6/plumbing/filemode"
Expand Down Expand Up @@ -184,9 +185,10 @@ func setupTestRepo(t *testing.T) (*gogit.Repository, string) {
dir = resolved
}

repo, err := gogit.PlainInit(dir, false)
testutil.InitRepo(t, dir)
repo, err := gogit.PlainOpen(dir)
if err != nil {
t.Fatalf("git init: %v", err)
t.Fatalf("git open: %v", err)
}

wt, err := repo.Worktree()
Expand Down
Loading
Loading