Orca is the place for working with a fleet of agents (e.g. Grok Bot, Claude Code). Run any coding agent with your own subscription. Available on desktop, mobile and remote runtime.
TypeScript adeagent-ideai-agentsautomationbotclaude-codecodexghosttygrok-bothermes-agentmobile-appmuseopenclawopencodeorchestrationpiruntimeterminalworktreesyc-backed
fix(git): parse submodule paths that contain spaces (#35012)
OrcaWincead2e2d523e
diff --git a/src/main/git/source-control/submodule-paths.ts b/src/main/git/source-control/submodule-paths.tsindex b5383c63501..7d353094df5 100644--- a/src/main/git/source-control/submodule-paths.ts+++ b/src/main/git/source-control/submodule-paths.ts@@ -3,6 +3,7 @@ import type { GitRuntimeOptions } from '../git-runtime-options'import { gitOptionsForWorktree } from '../git-runtime-options'import { gitExecFileAsync, gitOptionalLocksDisabledEnv } from '../runner'import { gitRuntimeOptionsKey } from './git-runtime-options-cache-key'+import { iterateNulDelimitedFields } from '../../../shared/nul-delimited-fields'const SUBMODULE_PATHS_CACHE_TTL_MS = 5_000export const MAX_SUBMODULE_PATHS_CACHE_ENTRIES = 512@@ -97,21 +98,23 @@ export async function listSubmodulePaths(let paths: string[] = []try {const { stdout } = await gitExecFileAsync(- ['config', '--file', '.gitmodules', '--get-regexp', '^submodule\\..*\\.path$'],- { ...gitOptionsForWorktree(worktreePath, options), env: gitOptionalLocksDisabledEnv() }+ ['config', '-z', '--file', '.gitmodules', '--get-regexp', '^submodule\\..*\\.path$'],+ {+ ...gitOptionsForWorktree(worktreePath, options),+ env: gitOptionalLocksDisabledEnv(),+ captureWslLoginShellOutput: true+ })- paths = stdout- .split(/\r?\n/)- .map((line) => {- const spaceIndex = line.indexOf(' ')- return spaceIndex === -1- ? ''- : line- .slice(spaceIndex + 1)- .trim()- .replace(/\/+$/, '')- })- .filter((value) => value.length > 0)+ for (const record of iterateNulDelimitedFields(stdout)) {+ const separator = record.indexOf('\n')+ if (separator === -1) {+ continue+ }+ const submodulePath = record.slice(separator + 1).replace(/\/+$/, '')+ if (submodulePath) {+ paths.push(submodulePath)+ }+ }} catch {paths = []}diff --git a/src/main/git/status-submodule-path-cache.test.ts b/src/main/git/status-submodule-path-cache.test.tsindex af74553bdb0..1de1354a8c9 100644--- a/src/main/git/status-submodule-path-cache.test.ts+++ b/src/main/git/status-submodule-path-cache.test.ts@@ -38,7 +38,7 @@ describe('submodule path cache', () => {gitStreamStdoutMock.mockReset()gitExecFileAsyncMock.mockImplementation((_args: string[], options?: { cwd?: string }) =>Promise.resolve({- stdout: `submodule.lib.path ${String(options?.cwd ?? 'repo').replace(/^.*[/\\\\]/, '')}-lib\n`+ stdout: `submodule.lib.path\n${String(options?.cwd ?? 'repo').replace(/^.*[/\\\\]/, '')}-lib\0`}))})@@ -106,7 +106,7 @@ describe('submodule path cache', () => {const oldRead = listSubmodulePaths('/repo')expect(resolveOldRead).toBeTypeOf('function')clearSubmodulePathsCacheForTests()- resolveOldRead?.({ stdout: 'submodule.lib.path old-lib\n' })+ resolveOldRead?.({ stdout: 'submodule.lib.path\nold-lib\0' })await expect(oldRead).resolves.toEqual(['old-lib'])expect(getSubmodulePathsCacheCountForTests()).toBe(0)@@ -121,7 +121,7 @@ describe('submodule path cache', () => {modulePath = 'feature-lib'return Promise.resolve({ stdout: '' })}- return Promise.resolve({ stdout: `submodule.lib.path ${modulePath}\n` })+ return Promise.resolve({ stdout: `submodule.lib.path\n${modulePath}\0` })})const runtime = { wslDistro: 'Ubuntu' }@@ -153,7 +153,7 @@ describe('submodule path cache', () => {return Promise.resolve({ stdout: '' })}if (args[0] === 'config' && args.includes('.gitmodules')) {- return Promise.resolve({ stdout: `submodule.lib.path ${modulePath}\n` })+ return Promise.resolve({ stdout: `submodule.lib.path\n${modulePath}\0` })}return Promise.resolve({ stdout: '' })})@@ -179,7 +179,7 @@ describe('submodule path cache', () => {return Promise.resolve({ stdout: '' })}return Promise.resolve({- stdout: modulePath ? `submodule.lib.path ${modulePath}\n` : ''+ stdout: modulePath ? `submodule.lib.path\n${modulePath}\0` : ''})})@@ -203,7 +203,7 @@ describe('submodule path cache', () => {}if (args[0] === 'config' && args.includes('.gitmodules')) {return Promise.resolve({- stdout: recreated ? 'submodule.lib.path recreated-lib\n' : ''+ stdout: recreated ? 'submodule.lib.path\nrecreated-lib\0' : ''})}return Promise.resolve({ stdout: '' })diff --git a/src/main/git/status-submodule.test.ts b/src/main/git/status-submodule.test.tsindex a4c3d24d1a5..bcf599f5363 100644--- a/src/main/git/status-submodule.test.ts+++ b/src/main/git/status-submodule.test.ts@@ -80,7 +80,7 @@ describe('submodule diff routing', () => {if (args[0] === 'config' && args.includes('.gitmodules')) {// Declare the submodule only in its parent so recursion terminates.return Promise.resolve({- stdout: options?.cwd === PARENT ? 'submodule.flutter_mine.path flutter_mine\n' : ''+ stdout: options?.cwd === PARENT ? 'submodule.flutter_mine.path\nflutter_mine\0' : ''})}if (args[0] === 'ls-files') {@@ -135,7 +135,7 @@ describe('submodule diff routing', () => {gitExecFileAsyncMock.mockImplementation((args: string[], options?: { cwd?: string }) => {if (args[0] === 'config' && args.includes('.gitmodules')) {return Promise.resolve({- stdout: options?.cwd === PARENT ? 'submodule.flutter_mine.path flutter_mine\n' : ''+ stdout: options?.cwd === PARENT ? 'submodule.flutter_mine.path\nflutter_mine\0' : ''})}if (args[0] === 'ls-files') {@@ -179,7 +179,7 @@ describe('submodule diff routing', () => {gitExecFileAsyncMock.mockImplementation((args: string[], options?: { cwd?: string }) => {if (args[0] === 'config' && args.includes('.gitmodules')) {return Promise.resolve({- stdout: options?.cwd === PARENT ? 'submodule.flutter_mine.path flutter_mine\n' : ''+ stdout: options?.cwd === PARENT ? 'submodule.flutter_mine.path\nflutter_mine\0' : ''})}if (args[0] === 'ls-files') {@@ -213,7 +213,7 @@ describe('submodule diff routing', () => {gitExecFileAsyncMock.mockImplementation((args: string[], options?: { cwd?: string }) => {if (args[0] === 'config' && args.includes('.gitmodules')) {return Promise.resolve({- stdout: options?.cwd === PARENT ? 'submodule.evil.path ../evil\n' : ''+ stdout: options?.cwd === PARENT ? 'submodule.evil.path\n../evil\0' : ''})}return Promise.resolve({ stdout: '' })@@ -226,7 +226,7 @@ describe('submodule diff routing', () => {gitExecFileAsyncMock.mockImplementation((args: string[], options?: { cwd?: string }) => {if (args[0] === 'config' && args.includes('.gitmodules')) {return Promise.resolve({- stdout: options?.cwd === PARENT ? 'submodule.evil.path ../evil\n' : ''+ stdout: options?.cwd === PARENT ? 'submodule.evil.path\n../evil\0' : ''})}return Promise.resolve({ stdout: '' })@@ -262,8 +262,8 @@ describe('listSubmodulePaths', () => {Promise.resolve({stdout:options?.wslDistro === 'debian'- ? 'submodule.lib.path debian-lib\n'- : 'submodule.lib.path ubuntu-lib\n'+ ? 'submodule.lib.path\ndebian-lib\0'+ : 'submodule.lib.path\nubuntu-lib\0'}))@@ -276,6 +276,12 @@ describe('listSubmodulePaths', () => {expect(gitExecFileAsyncMock).toHaveBeenCalledTimes(2)})++ it('reads submodule names and paths that contain spaces', async () => {+ gitExecFileAsyncMock.mockResolvedValue({ stdout: 'submodule.my lib.path\nmy lib\0' })++ await expect(listSubmodulePaths('/repo')).resolves.toEqual(['my lib'])+ })})describe('getSubmoduleStatus', () => {diff --git a/src/main/ipc/repos-local-clone-lifecycle.test.ts b/src/main/ipc/repos-local-clone-lifecycle.test.tsindex bdcede3be59..098fefbceec 100644--- a/src/main/ipc/repos-local-clone-lifecycle.test.ts+++ b/src/main/ipc/repos-local-clone-lifecycle.test.ts@@ -129,7 +129,7 @@ describe('repos:add + repos:clone', () => {Promise.resolve({stdout:args[0] === 'config' && args.includes('.gitmodules') && cloned- ? 'submodule.lib.path vendor/lib\n'+ ? 'submodule.lib.path\nvendor/lib\0': '',stderr: ''})