File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -213,6 +213,11 @@ describe("isTemporaryWorktreeBranch", () => {
213213 expect ( isTemporaryWorktreeBranch ( flat ) ) . toBe ( true ) ;
214214 expect ( isTemporaryWorktreeBranch ( `${ WORKTREE_BRANCH_PREFIX } -deadbeef-extra` ) ) . toBe ( false ) ;
215215 expect ( isTemporaryWorktreeBranch ( `${ WORKTREE_BRANCH_PREFIX } -feature` ) ) . toBe ( false ) ;
216+ expect (
217+ flattenTemporaryWorktreeBranchName (
218+ `${ WORKTREE_BRANCH_PREFIX } /f4ae4e0e-f971-4d48-b4f2-9cf0aa54ab12` ,
219+ ) ,
220+ ) . toBe ( `${ WORKTREE_BRANCH_PREFIX } -f4ae4e0e` ) ;
216221 } ) ;
217222
218223 it ( "rejects non-temporary refName names" , ( ) => {
Original file line number Diff line number Diff line change @@ -129,7 +129,12 @@ export function buildTemporaryWorktreeBranchName(
129129 * ref impossible. This moves a temporary name to the flat `t3code-<hex>` sibling.
130130 */
131131export function flattenTemporaryWorktreeBranchName ( refName : string ) : string {
132- return refName . replace ( `${ WORKTREE_BRANCH_PREFIX } /` , `${ WORKTREE_BRANCH_PREFIX } -` ) ;
132+ // Keep only the canonical 8-hex token so legacy UUID names stay recognizable.
133+ const token = refName
134+ . trim ( )
135+ . toLowerCase ( )
136+ . slice ( WORKTREE_BRANCH_PREFIX . length + 1 , WORKTREE_BRANCH_PREFIX . length + 9 ) ;
137+ return `${ WORKTREE_BRANCH_PREFIX } -${ token } ` ;
133138}
134139
135140export function isTemporaryWorktreeBranch ( refName : string ) : boolean {
You can’t perform that action at this time.
0 commit comments