@@ -275,13 +275,82 @@ describe('ensureSharedHistory', () => {
275275 expect ( logs . mocks . warn ) . not . toHaveBeenCalled ( ) ;
276276 expect ( logs . mocks . error ) . not . toHaveBeenCalled ( ) ;
277277
278- expect ( filteredGitCalls ( ) ) . toMatchInlineSnapshot ( `
278+ const gitCalls = gitSpy . mock . calls
279+ . map ( ( call , i ) => {
280+ const parts = [ call [ 0 ] . join ( ' ' ) ] ;
281+ const result = gitSpy . mock . results [ i ] . value as workspaceTools . GitProcessOutput ;
282+ parts . push ( `=> ${ result . success ? 'success' : 'failure' } ` ) ;
283+ const stdout = result . stdout . trim ( ) . replace ( / [ a - f \d ] { 40 } / g, '<commit>' ) ;
284+ stdout && parts . push ( stdout ) ;
285+ const stderr = result . stderr . trim ( ) . replace ( repositoryFactory . originRoot , '<origin-root>' ) ;
286+ stderr && parts . push ( stderr ) ;
287+ return parts . join ( '\n' ) ;
288+ } )
289+ . join ( '\n\n' ) ;
290+ expect ( gitCalls ) . toMatchInlineSnapshot ( `
291+ "rev-parse --verify origin/master
292+ => failure
293+ fatal: Needed a single revision
294+
295+ config --get-all remote.origin.fetch
296+ => success
297+ +refs/heads/test:refs/remotes/origin/test
298+
299+ remote set-branches --add origin master
300+ => success
301+
302+ rev-parse --is-shallow-repository
303+ => success
304+ true
305+
306+ fetch --depth=2 origin master
307+ => success
308+ From <origin-root>
309+ * branch master -> FETCH_HEAD
310+ * [new branch] master -> origin/master
311+
312+ merge-base origin/master HEAD
313+ => failure
314+
315+ rev-parse --is-shallow-repository
316+ => success
317+ true
318+
319+ fetch --deepen=2 origin master
320+ => success
321+ From <origin-root>
322+ * branch master -> FETCH_HEAD
323+
324+ merge-base origin/master HEAD
325+ => failure
326+
327+ rev-parse --is-shallow-repository
328+ => success
329+ true
330+
331+ fetch --deepen=2 origin master
332+ => success
333+ From <origin-root>
334+ * branch master -> FETCH_HEAD
335+
336+ merge-base origin/master HEAD
337+ => success
338+ <commit>"
339+ ` ) ;
340+ expect ( filteredGitCalls ( [ ] ) ) . toMatchInlineSnapshot ( `
279341 [
342+ "rev-parse --verify origin/master",
280343 "config --get-all remote.origin.fetch",
281344 "remote set-branches --add origin master",
345+ "rev-parse --is-shallow-repository",
282346 "fetch --depth=2 origin master",
347+ "merge-base origin/master HEAD",
348+ "rev-parse --is-shallow-repository",
283349 "fetch --deepen=2 origin master",
350+ "merge-base origin/master HEAD",
351+ "rev-parse --is-shallow-repository",
284352 "fetch --deepen=2 origin master",
353+ "merge-base origin/master HEAD",
285354 ]
286355 ` ) ;
287356 } ) ;
0 commit comments