@@ -2583,8 +2583,33 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
25832583 yield * git ( cwd , [ "commit" , "-m" , "feature commit" ] ) ;
25842584 yield * git ( cwd , [ "push" , "-u" , "origin" , "feature/remote-status" ] ) ;
25852585 yield * writeTextFile ( cwd , "untracked.txt" , "local-only\n" ) ;
2586+ yield * git ( cwd , [
2587+ "symbolic-ref" ,
2588+ "refs/remotes/origin/HEAD" ,
2589+ `refs/remotes/origin/${ initialBranch } ` ,
2590+ ] ) ;
25862591
2587- const status = yield * ( yield * GitVcsDriver . GitVcsDriver ) . statusDetailsRemote ( cwd ) ;
2592+ const delegate = yield * ChildProcessSpawner . ChildProcessSpawner ;
2593+ let originHeadReads = 0 ;
2594+ let failFirstOriginHead = false ;
2595+ const spawner = ChildProcessSpawner . make ( ( command ) =>
2596+ Effect . gen ( function * ( ) {
2597+ if (
2598+ ChildProcess . isStandardCommand ( command ) &&
2599+ command . args . join ( " " ) === "symbolic-ref refs/remotes/origin/HEAD"
2600+ ) {
2601+ originHeadReads ++ ;
2602+ if ( failFirstOriginHead && originHeadReads === 1 ) return makeNonRepositoryHandle ( ) ;
2603+ }
2604+ return yield * delegate . spawn ( command ) ;
2605+ } ) ,
2606+ ) ;
2607+ const driver = yield * makeGitVcsDriverCore ( ) . pipe (
2608+ Effect . provideService ( ChildProcessSpawner . ChildProcessSpawner , spawner ) ,
2609+ Effect . provide ( layerServerConfig ) ,
2610+ ) ;
2611+ const status = yield * driver . statusDetailsRemote ( cwd , { refreshUpstream : false } ) ;
2612+ const successfulHeadReads = originHeadReads ;
25882613
25892614 assert . equal ( status . isRepo , true ) ;
25902615 assert . equal ( status . branch , "feature/remote-status" ) ;
@@ -2594,6 +2619,14 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
25942619 assert . equal ( status . aheadOfDefaultCount , 1 ) ;
25952620 assert . notProperty ( status , "workingTree" ) ;
25962621 assert . notProperty ( status , "hasWorkingTreeChanges" ) ;
2622+
2623+ // An unavailable first read must retain the comparison lookup's retry.
2624+ originHeadReads = 0 ;
2625+ failFirstOriginHead = true ;
2626+ const retried = yield * driver . statusDetailsRemote ( cwd , { refreshUpstream : false } ) ;
2627+ assert . deepEqual ( retried , { ...status , defaultBranch : null } ) ;
2628+ assert . equal ( originHeadReads , 2 ) ;
2629+ assert . equal ( successfulHeadReads , 1 ) ;
25972630 } ) ,
25982631 ) ;
25992632
0 commit comments