BuzzbeeSCD/openchamber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove shell-specific \&\& operators for non-POSIX shell compat (#870) (#888)

Browse Source 
Replace shell `\&\&` and `||` operators in execCommand calls with
TypeScript control flow. This fixes re-integrate commits failing when
the user's default shell is Nushell, which does not support `\&\&`.

Changes:
- createTempWorktree: split `mkdir \&\& mktemp` into two calls
- ensureLocalBranch: use isOk() instead of `echo ok || echo missing`
- isCherryPickInProgress: use isOk() instead of `echo yes || echo no`

Closes #870
This commit is contained in:
jwcrystal
2026-04-11 23:43:57 +03:00
committed by GitHub
parent 6425161bef
commit 291d00de8b
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/src/lib/git/integrateWorktreeCommits.ts
+13 -7
View File
@@ -110,10 +110,10 @@ async function ensureLocalBranch(repoRoot: string, candidate: string): Promise<s
} }
const hasLocal = await execCommand( const hasLocal = await execCommand(
`git show-ref --verify --quiet ${shellQuote(`refs/heads/${raw}`)} && echo ok || echo missing`, `git show-ref --verify --quiet ${shellQuote(`refs/heads/${raw}`)}`,
repoRoot repoRoot
); );
if (stdoutText(hasLocal) === 'ok') { if (isOk(hasLocal)) {
return raw; return raw;
} }
@@ -131,10 +131,10 @@ async function ensureLocalBranch(repoRoot: string, candidate: string): Promise<s
// Try origin/<raw> // Try origin/<raw>
const remoteCheck = await execCommand( const remoteCheck = await execCommand(
`git show-ref --verify --quiet ${shellQuote(`refs/remotes/origin/${raw}`)} && echo ok || echo missing`, `git show-ref --verify --quiet ${shellQuote(`refs/remotes/origin/${raw}`)}`,
repoRoot repoRoot
); );
if (stdoutText(remoteCheck) === 'ok') { if (isOk(remoteCheck)) {
await execCommand(`git branch --track ${shellQuote(raw)} ${shellQuote(`origin/${raw}`)}`, repoRoot); await execCommand(`git branch --track ${shellQuote(raw)} ${shellQuote(`origin/${raw}`)}`, repoRoot);
return raw; return raw;
} }
@@ -177,8 +177,14 @@ export async function computeIntegratePlan(args: {
} }
async function createTempWorktree(repoRoot: string, targetBranch: string): Promise<string> { async function createTempWorktree(repoRoot: string, targetBranch: string): Promise<string> {
// Use two separate execCommand calls instead of shell-specific && operator
// to support non-POSIX shells like Nushell (see #870)
const mkdirResult = await execCommand('mkdir -p "$HOME/.config/openchamber/tmp"', repoRoot);
if (!isOk(mkdirResult)) {
throw new Error(stderrText(mkdirResult) || 'Failed to create temp directory parent');
}
const tmp = await execCommand( const tmp = await execCommand(
'mkdir -p "$HOME/.config/openchamber/tmp" && mktemp -d "$HOME/.config/openchamber/tmp/oc-integrate-XXXXXX"', 'mktemp -d "$HOME/.config/openchamber/tmp/oc-integrate-XXXXXX"',
repoRoot repoRoot
); );
const tmpDir = stdoutText(tmp); const tmpDir = stdoutText(tmp);
@@ -234,8 +240,8 @@ export async function getIntegrateConflictDetails(tmpDir: string): Promise<Integ
} }
export async function isCherryPickInProgress(tmpDir: string): Promise<boolean> { export async function isCherryPickInProgress(tmpDir: string): Promise<boolean> {
const head = await execCommand('git rev-parse --verify --quiet CHERRY_PICK_HEAD && echo yes || echo no', tmpDir); const head = await execCommand('git rev-parse --verify --quiet CHERRY_PICK_HEAD', tmpDir);
return stdoutText(head) === 'yes'; return isOk(head);
} }
export async function integrateWorktreeCommits(plan: IntegratePlan): Promise<IntegrateResult> { export async function integrateWorktreeCommits(plan: IntegratePlan): Promise<IntegrateResult> {