fix: quote include fetch paths - #1891
Open
cyphercodes wants to merge 1 commit into
Open
Conversation
firecow
reviewed
Jul 31, 2026
| `cd ${tmpDir}`, | ||
| `git sparse-checkout set --no-cone ${normalizedFile}`, | ||
| `cd ${Utils.safeBashString(`${cwd}/${stateDir}`)}`, | ||
| `git clone ${gitCloneBranch} -n --depth=1 --filter=tree:0 ${remote.schema}://${remote.host}:${remote.port}/${project}.git ${Utils.safeBashString(tmpDir)}`, |
Owner
There was a problem hiding this comment.
Suggested change
| `git clone ${gitCloneBranch} -n --depth=1 --filter=tree:0 ${remote.schema}://${remote.host}:${remote.port}/${project}.git ${Utils.safeBashString(tmpDir)}`, | |
| `git clone ${gitCloneBranch} -n --depth=1 --filter=tree:0 ${Utils.safeBashString(`${remote.schema}://${remote.host}:${remote.port}/${project}.git`)} ${Utils.safeBashString(tmpDir)}`, |
| `cd ${tmpDir}`, | ||
| `git sparse-checkout set --no-cone ${files[0]} ${files[1]}`, | ||
| `cd ${Utils.safeBashString(`${cwd}/${stateDir}`)}`, | ||
| `git clone ${gitCloneBranch} -n --depth=1 --filter=tree:0 ${remote.schema}://${remote.host}:${remote.port}/${project}.git ${Utils.safeBashString(tmpDir)}`, |
Owner
There was a problem hiding this comment.
Suggested change
| `git clone ${gitCloneBranch} -n --depth=1 --filter=tree:0 ${remote.schema}://${remote.host}:${remote.port}/${project}.git ${Utils.safeBashString(tmpDir)}`, | |
| `git clone ${gitCloneBranch} -n --depth=1 --filter=tree:0 ${Utils.safeBashString(`${remote.schema}://${remote.host}:${remote.port}/${project}.git`)} ${Utils.safeBashString(tmpDir)}`, |
|
|
||
| expect(bashMultiSpy).toHaveBeenCalledWith([ | ||
| `cd '${cwd}/${stateDir}'`, | ||
| `git clone --branch '1.3.0' -n --depth=1 --filter=tree:0 https://gitlab.com:443/arc/ci-cd-components.git '${tmpDir}'`, |
Owner
There was a problem hiding this comment.
Suggested change
| `git clone --branch '1.3.0' -n --depth=1 --filter=tree:0 https://gitlab.com:443/arc/ci-cd-components.git '${tmpDir}'`, | |
| `git clone --branch '1.3.0' -n --depth=1 --filter=tree:0 'https://gitlab.com:443/arc/ci-cd-components.git' '${tmpDir}'`, |
Separately: this test pins an exact command array with everything mocked, breaks on any added flag, never runs bash. Also bashMulti already sets cwd, so cd ${cwd}/${stateDir} could be cd ${stateDir}.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #1887
Tests
bunx vitest run tests/parser-includes.test.tsbun run typecheckbun run lintbunx vitest run tests/test-cases/include-component/integration.test.tsSummary by cubic
Quote all generated bash args during HTTP include fetches to prevent path splitting and checkout failures on paths with spaces. Fixes #1887 and adds tests for Windows-style paths.
cwd, temp dirs, branch refs, and sparse-checkout file paths withUtils.safeBashStringacrosscd,git clone,git sparse-checkout, andcp.cwdincludes spaces on Windows.Written for commit db073fa. Summary will update on new commits.