@@ -136,14 +136,15 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
136136 run : ( input ) =>
137137 Effect . sync ( ( ) => {
138138 calls . push ( input . args ) ;
139- const rootLookup = input . args . includes ( "rev-parse" ) ;
140- const failed = rootLookup && rootAttempts ++ === 0 ;
139+ const bareProbe = input . args . includes ( "--is-bare-repository" ) ;
140+ const rootLookup = input . args . includes ( "--show-toplevel" ) ;
141+ const failed = bareProbe || ( rootLookup && rootAttempts ++ === 0 ) ;
141142 return {
142- stdout : rootLookup
143- ? failed
144- ? ""
145- : "/repo\n"
146- :
"origin\[email protected] :T3Tools/t3code.git (fetch)\n" , 143+ stdout : failed
144+ ? ""
145+ : rootLookup
146+ ? "/repo\n"
147+ :
"origin\[email protected] :T3Tools/t3code.git (fetch)\n" , 147148 stderr : failed ? "temporary Git failure" : "" ,
148149 code : ChildProcessSpawner . ExitCode ( failed ? 1 : 0 ) ,
149150 timedOut : false ,
@@ -169,12 +170,54 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
169170 expect ( recovered ?. rootPath ) . toBe ( "/repo" ) ;
170171 expect ( calls ) . toEqual ( [
171172 [ "-C" , "/repo/packages/web" , "rev-parse" , "--show-toplevel" ] ,
173+ [ "-C" , "/repo/packages/web" , "rev-parse" , "--is-bare-repository" , "--absolute-git-dir" ] ,
172174 [ "-C" , "/repo/packages/web" , "rev-parse" , "--show-toplevel" ] ,
173175 [ "-C" , "/repo" , "remote" , "-v" ] ,
174176 ] ) ;
175177 } ) . pipe ( Effect . provide ( Layer . merge ( TestClock . layer ( ) , layerResolver ) ) ) ;
176178 } ) ;
177179
180+ it . effect . each ( [ "times out" , "cannot start" ] as const ) (
181+ "skips the bare repository probe when Git root discovery %s" ,
182+ ( failure ) => {
183+ const calls : Array < ReadonlyArray < string > > = [ ] ;
184+ const layerProcessRunner = Layer . succeed ( ProcessRunner . ProcessRunner , {
185+ run : ( input ) =>
186+ Effect . suspend ( ( ) => {
187+ calls . push ( input . args ) ;
188+ return failure === "times out"
189+ ? Effect . succeed ( {
190+ stdout : "" ,
191+ stderr : "" ,
192+ code : null ,
193+ timedOut : true ,
194+ stdoutTruncated : false ,
195+ stderrTruncated : false ,
196+ stdoutInvalidUtf8 : false ,
197+ stderrInvalidUtf8 : false ,
198+ } )
199+ : Effect . fail (
200+ new ProcessRunner . ProcessSpawnError ( {
201+ command : input . command ,
202+ argumentCount : input . args . length ,
203+ cause : new Error ( "git is not installed" ) ,
204+ } ) ,
205+ ) ;
206+ } ) ,
207+ } ) ;
208+ const layerResolver = Layer . effect (
209+ RepositoryIdentityResolver . RepositoryIdentityResolver ,
210+ RepositoryIdentityResolver . make ( ) ,
211+ ) . pipe ( Layer . provide ( layerProcessRunner ) ) ;
212+
213+ return Effect . gen ( function * ( ) {
214+ const resolver = yield * RepositoryIdentityResolver . RepositoryIdentityResolver ;
215+ expect ( yield * resolver . resolve ( "/repo" ) ) . toBeNull ( ) ;
216+ expect ( calls ) . toEqual ( [ [ "-C" , "/repo" , "rev-parse" , "--show-toplevel" ] ] ) ;
217+ } ) . pipe ( Effect . provide ( layerResolver ) ) ;
218+ } ,
219+ ) ;
220+
178221 it . effect ( "normalizes equivalent GitHub remotes into a stable repository identity" , ( ) =>
179222 Effect . gen ( function * ( ) {
180223 const fileSystem = yield * FileSystem . FileSystem ;
@@ -230,6 +273,70 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
230273 } ) . pipe ( Effect . provide ( RepositoryIdentityResolver . layer ) ) ,
231274 ) ;
232275
276+ it . effect . each ( [ "bare clone" , "dot-bare" ] as const ) (
277+ "groups a %s repository with checkouts of the same remote" ,
278+ ( layout ) =>
279+ Effect . gen ( function * ( ) {
280+ const fileSystem = yield * FileSystem . FileSystem ;
281+ const path = yield * Path . Path ;
282+ const checkout = yield * fileSystem . makeTempDirectoryScoped ( {
283+ prefix : "t3-repository-identity-checkout-" ,
284+ } ) ;
285+ const root = yield * fileSystem . makeTempDirectoryScoped ( {
286+ prefix : "t3-repository-identity-bare-" ,
287+ } ) ;
288+ const bareGitDir = layout === "dot-bare" ? path . join ( root , ".bare" ) : root ;
289+
290+ yield * git ( checkout , [ "init" ] ) ;
291+ yield * git ( checkout , [ "remote" , "add" , "origin" , "[email protected] :T3Tools/t3code.git" ] ) ; 292+ yield * git ( root , [ "init" , "--bare" , bareGitDir ] ) ;
293+ if ( layout === "dot-bare" ) {
294+ yield * fileSystem . writeFileString ( path . join ( root , ".git" ) , "gitdir: ./.bare\n" ) ;
295+ }
296+ yield * git ( bareGitDir , [
297+ "remote" ,
298+ "add" ,
299+ "origin" ,
300+ "https://github.com/T3Tools/t3code.git" ,
301+ ] ) ;
302+
303+ const resolver = yield * RepositoryIdentityResolver . RepositoryIdentityResolver ;
304+ const checkoutIdentity = yield * resolver . resolve ( checkout ) ;
305+ const resolvedBareGitDir = NodeFS . realpathSync . native ( bareGitDir ) ;
306+ // Users open a dot-bare layout from its container or from .bare itself.
307+ const projectRoots = layout === "dot-bare" ? [ root , bareGitDir ] : [ root ] ;
308+
309+ for ( const projectRoot of projectRoots ) {
310+ const identity = yield * resolver . resolve ( projectRoot ) ;
311+ const resolvedIdentityRoot =
312+ identity ?. rootPath === undefined ? "" : NodeFS . realpathSync . native ( identity . rootPath ) ;
313+
314+ expect ( identity ) . not . toBeNull ( ) ;
315+ expect ( identity ?. canonicalKey ) . toBe ( checkoutIdentity ?. canonicalKey ) ;
316+ expect ( normalizeResolvedPath ( resolvedIdentityRoot ) ) . toBe (
317+ normalizeResolvedPath ( resolvedBareGitDir ) ,
318+ ) ;
319+ }
320+ } ) . pipe ( Effect . provide ( RepositoryIdentityResolver . layer ) ) ,
321+ ) ;
322+
323+ it . effect ( "returns null for the .git folder of a checkout" , ( ) =>
324+ Effect . gen ( function * ( ) {
325+ const fileSystem = yield * FileSystem . FileSystem ;
326+ const path = yield * Path . Path ;
327+ const cwd = yield * fileSystem . makeTempDirectoryScoped ( {
328+ prefix : "t3-repository-identity-dot-git-" ,
329+ } ) ;
330+
331+ yield * git ( cwd , [ "init" ] ) ;
332+ yield * git ( cwd , [ "remote" , "add" , "origin" , "[email protected] :T3Tools/t3code.git" ] ) ; 333+
334+ const resolver = yield * RepositoryIdentityResolver . RepositoryIdentityResolver ;
335+ expect ( yield * resolver . resolve ( cwd ) ) . not . toBeNull ( ) ;
336+ expect ( yield * resolver . resolve ( path . join ( cwd , ".git" ) ) ) . toBeNull ( ) ;
337+ } ) . pipe ( Effect . provide ( RepositoryIdentityResolver . layer ) ) ,
338+ ) ;
339+
233340 it . effect ( "returns null for non-git folders and repos without remotes" , ( ) =>
234341 Effect . gen ( function * ( ) {
235342 const fileSystem = yield * FileSystem . FileSystem ;
@@ -239,15 +346,21 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
239346 const gitDir = yield * fileSystem . makeTempDirectoryScoped ( {
240347 prefix : "t3-repository-identity-no-remote-" ,
241348 } ) ;
349+ const bareGitDir = yield * fileSystem . makeTempDirectoryScoped ( {
350+ prefix : "t3-repository-identity-bare-no-remote-" ,
351+ } ) ;
242352
243353 yield * git ( gitDir , [ "init" ] ) ;
354+ yield * git ( bareGitDir , [ "init" , "--bare" ] ) ;
244355
245356 const resolver = yield * RepositoryIdentityResolver . RepositoryIdentityResolver ;
246357 const nonGitIdentity = yield * resolver . resolve ( nonGitDir ) ;
247358 const noRemoteIdentity = yield * resolver . resolve ( gitDir ) ;
359+ const bareNoRemoteIdentity = yield * resolver . resolve ( bareGitDir ) ;
248360
249361 expect ( nonGitIdentity ) . toBeNull ( ) ;
250362 expect ( noRemoteIdentity ) . toBeNull ( ) ;
363+ expect ( bareNoRemoteIdentity ) . toBeNull ( ) ;
251364 } ) . pipe ( Effect . provide ( RepositoryIdentityResolver . layer ) ) ,
252365 ) ;
253366
0 commit comments