Skip to content

Commit 30be311

Browse files
authored
fix(server): fall back to the remote default branch instead of assuming main (pingdotgg#7078)
1 parent 4e169df commit 30be311

4 files changed

Lines changed: 68 additions & 0 deletions

File tree

‎apps/server/src/git/GitManager.test.ts‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2404,6 +2404,57 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
24042404
}),
24052405
);
24062406

2407+
it.effect("create_pr targets the remote default branch when it is not main", () =>
2408+
Effect.gen(function* () {
2409+
const repoDir = yield* makeTempDir("t3code-git-manager-");
2410+
yield* initRepo(repoDir);
2411+
const remoteDir = yield* createBareRemote();
2412+
yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
2413+
// A repository whose default branch is master, with no main anywhere.
2414+
yield* runGit(repoDir, ["push", "origin", "HEAD:master"]);
2415+
yield* runGit(repoDir, ["fetch", "origin"]);
2416+
yield* runGit(repoDir, ["remote", "set-head", "origin", "master"]);
2417+
2418+
yield* runGit(repoDir, ["checkout", "-b", "feature/master-default"]);
2419+
NodeFS.writeFileSync(NodePath.join(repoDir, "master-default.txt"), "master default\n");
2420+
yield* runGit(repoDir, ["add", "master-default.txt"]);
2421+
yield* runGit(repoDir, ["commit", "-m", "Master default"]);
2422+
2423+
const { manager, ghCalls } = yield* makeManager({
2424+
ghScenario: {
2425+
// Mirrors a provider that cannot report a default branch, as the Azure
2426+
// DevOps CLI does when it cannot detect the repository.
2427+
defaultBranch: "",
2428+
prListSequence: [
2429+
"[]",
2430+
// @effect-diagnostics-next-line preferSchemaOverJson:off
2431+
JSON.stringify([
2432+
{
2433+
number: 505,
2434+
title: "Master default",
2435+
url: "https://github.com/pingdotgg/codething-mvp/pull/505",
2436+
baseRefName: "master",
2437+
headRefName: "feature/master-default",
2438+
},
2439+
]),
2440+
],
2441+
},
2442+
});
2443+
2444+
const result = yield* runStackedAction(manager, {
2445+
cwd: repoDir,
2446+
action: "create_pr",
2447+
});
2448+
2449+
expect(result.pr.status).toBe("created");
2450+
expect(
2451+
ghCalls.some((call) =>
2452+
call.includes("pr create --base master --head feature/master-default"),
2453+
),
2454+
).toBe(true);
2455+
}),
2456+
);
2457+
24072458
it.effect("returns existing PR metadata for commit/push/pr action", () =>
24082459
Effect.gen(function* () {
24092460
const repoDir = yield* makeTempDir("t3code-git-manager-");

‎apps/server/src/git/GitManager.ts‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,6 +1489,18 @@ export const make = Effect.gen(function* () {
14891489
return defaultFromProvider;
14901490
}
14911491

1492+
// The provider lookup can fail for reasons unrelated to the branch, so fall
1493+
// back to what the remote itself records before assuming a name. A repository
1494+
// whose default branch is master would otherwise get a base branch that does
1495+
// not exist.
1496+
const defaultFromRemote = yield* gitCore.resolvePrimaryRemoteName(cwd).pipe(
1497+
Effect.flatMap((remoteName) => gitCore.resolveDefaultBranchName(cwd, remoteName)),
1498+
Effect.orElseSucceed(() => null),
1499+
);
1500+
if (defaultFromRemote) {
1501+
return defaultFromRemote;
1502+
}
1503+
14921504
return "main";
14931505
});
14941506

‎apps/server/src/vcs/GitVcsDriver.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,10 @@ export class GitVcsDriver extends Context.Service<
289289
) => Effect.Effect<GitRefreshCheckedOutBranchResult, GitCommandError>;
290290
readonly ensureRemote: (input: GitEnsureRemoteInput) => Effect.Effect<string, GitCommandError>;
291291
readonly resolvePrimaryRemoteName: (cwd: string) => Effect.Effect<string, GitCommandError>;
292+
readonly resolveDefaultBranchName: (
293+
cwd: string,
294+
remoteName: string,
295+
) => Effect.Effect<string | null, GitCommandError>;
292296
readonly fetchRemote: (input: GitFetchRemoteInput) => Effect.Effect<void, GitCommandError>;
293297
readonly remoteExists: (input: GitRemoteExistsInput) => Effect.Effect<boolean, GitCommandError>;
294298
readonly resolveRemoteTrackingCommit: (

‎apps/server/src/vcs/GitVcsDriverCore.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3189,6 +3189,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
31893189
withListRefsInvalidation(input.cwd, refreshCheckedOutBranch(input)),
31903190
ensureRemote: (input) => withListRefsInvalidation(input.cwd, ensureRemote(input)),
31913191
resolvePrimaryRemoteName,
3192+
resolveDefaultBranchName,
31923193
fetchRemote: (input) => withListRefsInvalidation(input.cwd, fetchRemote(input)),
31933194
remoteExists,
31943195
resolveRemoteTrackingCommit,

0 commit comments

Comments
 (0)