From 2f3cbe5e84f26cca0bf5e4106cfb0626b6073d47 Mon Sep 17 00:00:00 2001 From: Mohamed Boudra Date: Wed, 4 Feb 2026 23:56:29 +0700 Subject: [PATCH] Make git tests independent of init.defaultBranch --- packages/server/src/server/daemon-client.e2e.test.ts | 2 +- .../src/server/daemon-e2e/checkout-ship.e2e.test.ts | 2 +- .../src/server/daemon-e2e/git-operations.e2e.test.ts | 12 ++++++------ packages/server/src/utils/checkout-git.test.ts | 8 ++++---- packages/server/src/utils/worktree.test.ts | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/server/src/server/daemon-client.e2e.test.ts b/packages/server/src/server/daemon-client.e2e.test.ts index aecafe72e..d612d10fa 100644 --- a/packages/server/src/server/daemon-client.e2e.test.ts +++ b/packages/server/src/server/daemon-client.e2e.test.ts @@ -783,7 +783,7 @@ function waitForSignal( async () => { const cwd = tmpCwd(); - execSync("git init", { cwd, stdio: "pipe" }); + execSync("git init -b main", { cwd, stdio: "pipe" }); execSync("git config user.email 'test@test.com'", { cwd, stdio: "pipe", diff --git a/packages/server/src/server/daemon-e2e/checkout-ship.e2e.test.ts b/packages/server/src/server/daemon-e2e/checkout-ship.e2e.test.ts index d8d742b52..52e86f422 100644 --- a/packages/server/src/server/daemon-e2e/checkout-ship.e2e.test.ts +++ b/packages/server/src/server/daemon-e2e/checkout-ship.e2e.test.ts @@ -266,7 +266,7 @@ describe("daemon checkout ship loop", () => { initGitRepo(repoDir); const remoteDir = path.join(repoDir, "remote.git"); - execSync(`git init --bare ${remoteDir}`, { stdio: "pipe" }); + execSync(`git init --bare -b main ${remoteDir}`, { stdio: "pipe" }); execSync(`git remote add origin ${remoteDir}`, { cwd: repoDir, stdio: "pipe" }); execSync("git push -u origin main", { cwd: repoDir, stdio: "pipe" }); diff --git a/packages/server/src/server/daemon-e2e/git-operations.e2e.test.ts b/packages/server/src/server/daemon-e2e/git-operations.e2e.test.ts index edfd7f78e..54ba359d4 100644 --- a/packages/server/src/server/daemon-e2e/git-operations.e2e.test.ts +++ b/packages/server/src/server/daemon-e2e/git-operations.e2e.test.ts @@ -168,7 +168,7 @@ describe("daemon E2E", () => { // Initialize git repo with clean state const { execSync } = await import("child_process"); - execSync("git init", { cwd, stdio: "pipe" }); + execSync("git init -b main", { cwd, stdio: "pipe" }); execSync("git config user.email 'test@test.com'", { cwd, stdio: "pipe" }); execSync("git config user.name 'Test'", { cwd, stdio: "pipe" }); @@ -242,7 +242,7 @@ describe("daemon E2E", () => { // Initialize git repo const { execSync } = await import("child_process"); - execSync("git init", { cwd, stdio: "pipe" }); + execSync("git init -b main", { cwd, stdio: "pipe" }); execSync("git config user.email 'test@test.com'", { cwd, stdio: "pipe" }); execSync("git config user.name 'Test'", { cwd, stdio: "pipe" }); @@ -293,7 +293,7 @@ describe("daemon E2E", () => { // Initialize git repo with clean state const { execSync } = await import("child_process"); - execSync("git init", { cwd, stdio: "pipe" }); + execSync("git init -b main", { cwd, stdio: "pipe" }); execSync("git config user.email 'test@test.com'", { cwd, stdio: "pipe" }); execSync("git config user.name 'Test'", { cwd, stdio: "pipe" }); @@ -365,7 +365,7 @@ describe("daemon E2E", () => { const repoRoot = tmpCwd(); const { execSync } = await import("child_process"); - execSync("git init", { cwd: repoRoot, stdio: "pipe" }); + execSync("git init -b main", { cwd: repoRoot, stdio: "pipe" }); execSync("git config user.email 'test@test.com'", { cwd: repoRoot, stdio: "pipe", @@ -439,7 +439,7 @@ describe("daemon E2E", () => { const repoRoot = tmpCwd(); const { execSync } = await import("child_process"); - execSync("git init", { cwd: repoRoot, stdio: "pipe" }); + execSync("git init -b main", { cwd: repoRoot, stdio: "pipe" }); execSync("git config user.email 'test@test.com'", { cwd: repoRoot, stdio: "pipe", @@ -526,7 +526,7 @@ describe("daemon E2E", () => { const cwd = tmpCwd(); const { execSync } = await import("child_process"); - execSync("git init", { cwd, stdio: "pipe" }); + execSync("git init -b main", { cwd, stdio: "pipe" }); execSync("git config user.email 'test@test.com'", { cwd, stdio: "pipe" }); execSync("git config user.name 'Test'", { cwd, stdio: "pipe" }); diff --git a/packages/server/src/utils/checkout-git.test.ts b/packages/server/src/utils/checkout-git.test.ts index e5e82dbbd..58f447e15 100644 --- a/packages/server/src/utils/checkout-git.test.ts +++ b/packages/server/src/utils/checkout-git.test.ts @@ -80,7 +80,7 @@ describe("checkout git utilities", () => { it("exposes hasRemote when origin is configured", async () => { const remoteDir = join(tempDir, "remote.git"); - execSync(`git init --bare ${remoteDir}`); + execSync(`git init --bare -b main ${remoteDir}`); execSync(`git remote add origin ${remoteDir}`, { cwd: repoDir }); const status = await getCheckoutStatus(repoDir); @@ -232,7 +232,7 @@ describe("checkout git utilities", () => { it("merges from the most-ahead base ref (origin/main when it is ahead)", async () => { const remoteDir = join(tempDir, "remote.git"); - execSync(`git init --bare ${remoteDir}`); + execSync(`git init --bare -b main ${remoteDir}`); execSync(`git remote add origin ${remoteDir}`, { cwd: repoDir }); execSync("git push -u origin main", { cwd: repoDir }); @@ -262,7 +262,7 @@ describe("checkout git utilities", () => { it("merges from the most-ahead base ref (local main when it is ahead)", async () => { const remoteDir = join(tempDir, "remote.git"); - execSync(`git init --bare ${remoteDir}`); + execSync(`git init --bare -b main ${remoteDir}`); execSync(`git remote add origin ${remoteDir}`, { cwd: repoDir }); execSync("git push -u origin main", { cwd: repoDir }); @@ -312,7 +312,7 @@ describe("checkout git utilities", () => { it("pushes the current branch to origin", async () => { const remoteDir = join(tempDir, "remote.git"); - execSync(`git init --bare ${remoteDir}`); + execSync(`git init --bare -b main ${remoteDir}`); execSync(`git remote add origin ${remoteDir}`, { cwd: repoDir }); execSync("git push -u origin main", { cwd: repoDir }); diff --git a/packages/server/src/utils/worktree.test.ts b/packages/server/src/utils/worktree.test.ts index 1ab1d298a..0effe817a 100644 --- a/packages/server/src/utils/worktree.test.ts +++ b/packages/server/src/utils/worktree.test.ts @@ -25,7 +25,7 @@ describe("createWorktree", () => { // Create a git repo with an initial commit execSync(`mkdir -p ${repoDir}`); - execSync("git init", { cwd: repoDir }); + execSync("git init -b main", { cwd: repoDir }); execSync("git config user.email 'test@test.com'", { cwd: repoDir }); execSync("git config user.name 'Test'", { cwd: repoDir }); execSync("echo 'hello' > file.txt", { cwd: repoDir }); @@ -265,7 +265,7 @@ describe("paseo worktree manager", () => { paseoHome = join(tempDir, "paseo-home"); execSync(`mkdir -p ${repoDir}`); - execSync("git init", { cwd: repoDir }); + execSync("git init -b main", { cwd: repoDir }); execSync("git config user.email 'test@test.com'", { cwd: repoDir }); execSync("git config user.name 'Test'", { cwd: repoDir }); execSync("echo 'hello' > file.txt", { cwd: repoDir });