fix(dev-infra): preserve worktree path whitespace

scripts/change-scope.spec.ts

@@ -40,11 +40,11 @@ function write(path: string, content: string): void {
   writeFileSync(path, content)
 }
 
-function fixture(): Fixture {
+function fixture(worktreeName = 'worktree'): Fixture {
   const container = mkdtempSync(join(tmpdir(), 'dsh-change-scope-'))
   fixtureRoots.push(container)
   const origin = join(container, 'origin.git')
-  const root = join(container, 'worktree')
+  const root = join(container, worktreeName)
   const hooks = join(container, 'hooks')
   mkdirSync(hooks)
   git(container, ['init', '--bare', '--initial-branch=master', origin])
@@ -139,6 +139,14 @@ describe('change-scope', () => {
     expect(pushed.paths.committed).toEqual(['feature.txt'])
   })
 
+  it.skipIf(process.platform === 'win32')('preserves trailing spaces in the worktree path', () => {
+    const { root } = fixture('worktree ')
+    const report = jsonReport(root, 'HEAD')
+
+    expect(report.repository.root).toBe(realpathSync(root))
+    expect(report.paths).toEqual({ committed: [], staged: [], unstaged: [], untracked: [] })
+  })
+
   it('reports an exact head above a non-master stacked base while dirty paths remain worktree-local', () => {
     const { root } = fixture()
     git(root, ['switch', '-c', 'foundation'])

scripts/change-scope.ts

@@ -159,8 +159,17 @@ function diffPaths(root: string, args: string[], context: string): string[] {
   ], context))
 }
 
+function stripGitLineTerminator(output: string): string {
+  const withoutLineFeed = output.endsWith('\n') ? output.slice(0, -1) : output
+  return process.platform === 'win32' && withoutLineFeed.endsWith('\r')
+    ? withoutLineFeed.slice(0, -1)
+    : withoutLineFeed
+}
+
 function collectReport(options: ChangeScopeOptions, cwd: string): ChangeScopeReport {
-  const root = requireGit(cwd, ['rev-parse', '--show-toplevel'], 'cannot locate a Git worktree').trim()
+  const root = stripGitLineTerminator(
+    requireGit(cwd, ['rev-parse', '--show-toplevel'], 'cannot locate a Git worktree'),
+  )
   const baseSha = resolveCommit(root, 'base', options.base)
   const headSha = resolveCommit(root, 'head', options.head)
   const mergeBaseSha = resolveMergeBase(root, baseSha, headSha)