@@ -1129,6 +1129,71 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
11291129 20_000 ,
11301130 ) ;
11311131
1132+ it . effect (
1133+ "status preserves a fork PR whose head is named after the default branch" ,
1134+ ( ) =>
1135+ Effect . gen ( function * ( ) {
1136+ const repoDir = yield * makeTempDir ( "t3code-git-manager-" ) ;
1137+ yield * initRepo ( repoDir ) ;
1138+ const originDir = yield * createBareRemote ( ) ;
1139+ const forkDir = yield * createBareRemote ( ) ;
1140+ yield * runGit ( repoDir , [ "remote" , "add" , "origin" , originDir ] ) ;
1141+ yield * runGit ( repoDir , [ "push" , "-u" , "origin" , "main" ] ) ;
1142+ yield * runGit ( repoDir , [ "remote" , "set-head" , "origin" , "main" ] ) ;
1143+ yield * runGit ( repoDir , [ "remote" , "add" , "fork-seed" , forkDir ] ) ;
1144+ yield * runGit ( repoDir , [ "push" , "fork-seed" , "main" ] ) ;
1145+ yield * runGit ( repoDir , [ "checkout" , "-b" , "t3code/pr-777/main" ] ) ;
1146+ yield * runGit ( repoDir , [ "branch" , "--set-upstream-to" , "fork-seed/main" ] ) ;
1147+ yield * configureVisibleRemoteUrlWithLocalRewrite (
1148+ repoDir ,
1149+ "fork-seed" ,
1150+ "[email protected] :contributor/codething-mvp.git" , 1151+ forkDir ,
1152+ ) ;
1153+
1154+ const { manager, ghCalls } = yield * makeManager ( {
1155+ ghScenario : {
1156+ prListByHeadSelector : {
1157+ // @effect -diagnostics-next-line preferSchemaOverJson:off
1158+ "contributor:main" : JSON . stringify ( [
1159+ {
1160+ number : 777 ,
1161+ title : "Fork PR from main" ,
1162+ url : "https://github.com/pingdotgg/codething-mvp/pull/777" ,
1163+ baseRefName : "main" ,
1164+ headRefName : "main" ,
1165+ state : "OPEN" ,
1166+ updatedAt : "2026-03-10T07:00:00Z" ,
1167+ isCrossRepository : true ,
1168+ headRepository : {
1169+ nameWithOwner : "contributor/codething-mvp" ,
1170+ } ,
1171+ headRepositoryOwner : {
1172+ login : "contributor" ,
1173+ } ,
1174+ } ,
1175+ ] ) ,
1176+ } ,
1177+ } ,
1178+ } ) ;
1179+
1180+ const status = yield * manager . status ( { cwd : repoDir } ) ;
1181+ expect ( status . refName ) . toBe ( "t3code/pr-777/main" ) ;
1182+ expect ( status . pr ) . toEqual ( {
1183+ number : 777 ,
1184+ title : "Fork PR from main" ,
1185+ url : "https://github.com/pingdotgg/codething-mvp/pull/777" ,
1186+ baseRef : "main" ,
1187+ headRef : "main" ,
1188+ state : "open" ,
1189+ } ) ;
1190+ expect ( ghCalls ) . toContain (
1191+ "pr list --head contributor:main --state all --limit 20 --json number,title,url,baseRefName,headRefName,state,mergedAt,updatedAt,isCrossRepository,headRepository,headRepositoryOwner" ,
1192+ ) ;
1193+ } ) ,
1194+ 20_000 ,
1195+ ) ;
1196+
11321197 it . effect (
11331198 "status ignores synthetic local branch aliases when the upstream remote name contains slashes" ,
11341199 ( ) =>
@@ -1315,6 +1380,43 @@ it.layer(GitManagerTestLayer)("GitManager", (it) => {
13151380 } ) ,
13161381 ) ;
13171382
1383+ it . effect ( "status does not inherit a merged PR from a feature branch's default upstream" , ( ) =>
1384+ Effect . gen ( function * ( ) {
1385+ const repoDir = yield * makeTempDir ( "t3code-git-manager-" ) ;
1386+ yield * initRepo ( repoDir ) ;
1387+ const remoteDir = yield * createBareRemote ( ) ;
1388+ yield * runGit ( repoDir , [ "remote" , "add" , "origin" , remoteDir ] ) ;
1389+ yield * runGit ( repoDir , [ "push" , "-u" , "origin" , "main" ] ) ;
1390+ yield * runGit ( repoDir , [ "remote" , "set-head" , "origin" , "main" ] ) ;
1391+ yield * runGit ( repoDir , [ "checkout" , "-b" , "feature/from-main" , "origin/main" ] ) ;
1392+
1393+ const { manager, ghCalls } = yield * makeManager ( {
1394+ ghScenario : {
1395+ prListSequence : [
1396+ // @effect -diagnostics-next-line preferSchemaOverJson:off
1397+ JSON . stringify ( [
1398+ {
1399+ number : 54 ,
1400+ title : "Reverse merge from main" ,
1401+ url : "https://github.com/pingdotgg/codething-mvp/pull/54" ,
1402+ baseRefName : "je-filter-list" ,
1403+ headRefName : "main" ,
1404+ state : "MERGED" ,
1405+ mergedAt : "2023-09-28T03:21:10Z" ,
1406+ updatedAt : "2023-09-28T03:21:10Z" ,
1407+ } ,
1408+ ] ) ,
1409+ ] ,
1410+ } ,
1411+ } ) ;
1412+
1413+ const status = yield * manager . status ( { cwd : repoDir } ) ;
1414+ expect ( status . refName ) . toBe ( "feature/from-main" ) ;
1415+ expect ( status . pr ) . toBeNull ( ) ;
1416+ expect ( ghCalls . some ( ( call ) => call . includes ( "pr list" ) ) ) . toBe ( false ) ;
1417+ } ) ,
1418+ ) ;
1419+
13181420 it . effect ( "status prefers open PR when merged PR has newer updatedAt" , ( ) =>
13191421 Effect . gen ( function * ( ) {
13201422 const repoDir = yield * makeTempDir ( "t3code-git-manager-" ) ;
0 commit comments