Skip to content

Commit 6415fe2

Browse files
committed
fix(server): fall back to the remote default branch instead of assuming main
1 parent 21b6fb5 commit 6415fe2

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
@@ -2293,6 +2293,57 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
22932293
}),
22942294
);
22952295

2296+
it.effect("create_pr targets the remote default branch when it is not main", () =>
2297+
Effect.gen(function* () {
2298+
const repoDir = yield* makeTempDir("t3code-git-manager-");
2299+
yield* initRepo(repoDir);
2300+
const remoteDir = yield* createBareRemote();
2301+
yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
2302+
// A repository whose default branch is master, with no main anywhere.
2303+
yield* runGit(repoDir, ["push", "origin", "HEAD:master"]);
2304+
yield* runGit(repoDir, ["fetch", "origin"]);
2305+
yield* runGit(repoDir, ["remote", "set-head", "origin", "master"]);
2306+
2307+
yield* runGit(repoDir, ["checkout", "-b", "feature/master-default"]);
2308+
NodeFS.writeFileSync(NodePath.join(repoDir, "master-default.txt"), "master default\n");
2309+
yield* runGit(repoDir, ["add", "master-default.txt"]);
2310+
yield* runGit(repoDir, ["commit", "-m", "Master default"]);
2311+
2312+
const { manager, ghCalls } = yield* makeManager({
2313+
ghScenario: {
2314+
// Mirrors a provider that cannot report a default branch, as the Azure
2315+
// DevOps CLI does when it cannot detect the repository.
2316+
defaultBranch: "",
2317+
prListSequence: [
2318+
"[]",
2319+
// @effect-diagnostics-next-line preferSchemaOverJson:off
2320+
JSON.stringify([
2321+
{
2322+
number: 505,
2323+
title: "Master default",
2324+
url: "https://github.com/pingdotgg/codething-mvp/pull/505",
2325+
baseRefName: "master",
2326+
headRefName: "feature/master-default",
2327+
},
2328+
]),
2329+
],
2330+
},
2331+
});
2332+
2333+
const result = yield* runStackedAction(manager, {
2334+
cwd: repoDir,
2335+
action: "create_pr",
2336+
});
2337+
2338+
expect(result.pr.status).toBe("created");
2339+
expect(
2340+
ghCalls.some((call) =>
2341+
call.includes("pr create --base master --head feature/master-default"),
2342+
),
2343+
).toBe(true);
2344+
}),
2345+
);
2346+
22962347
it.effect("returns existing PR metadata for commit/push/pr action", () =>
22972348
Effect.gen(function* () {
22982349
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
@@ -1449,6 +1449,18 @@ export const make = Effect.gen(function* () {
14491449
return defaultFromProvider;
14501450
}
14511451

1452+
// The provider lookup can fail for reasons unrelated to the branch, so fall
1453+
// back to what the remote itself records before assuming a name. A repository
1454+
// whose default branch is master would otherwise get a base branch that does
1455+
// not exist.
1456+
const defaultFromRemote = yield* gitCore.resolvePrimaryRemoteName(cwd).pipe(
1457+
Effect.flatMap((remoteName) => gitCore.resolveDefaultBranchName(cwd, remoteName)),
1458+
Effect.orElseSucceed(() => null),
1459+
);
1460+
if (defaultFromRemote) {
1461+
return defaultFromRemote;
1462+
}
1463+
14521464
return "main";
14531465
});
14541466

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

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

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3177,6 +3177,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
31773177
withListRefsInvalidation(input.cwd, refreshCheckedOutBranch(input)),
31783178
ensureRemote: (input) => withListRefsInvalidation(input.cwd, ensureRemote(input)),
31793179
resolvePrimaryRemoteName,
3180+
resolveDefaultBranchName,
31803181
fetchRemote: (input) => withListRefsInvalidation(input.cwd, fetchRemote(input)),
31813182
remoteExists,
31823183
resolveRemoteTrackingCommit,

0 commit comments

Comments
 (0)