copy(cloud): git shim hold messages per design-squad (orca: prefix, git <cmd>, sidebar > Restart, newline-terminated)

This commit is contained in:
Neil
2026-11-11 19:29:18 -08:00
parent d441463abb
commit 8bb65d69b0
3 changed files with 9 additions and 6 deletions
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -34,9 +34,9 @@ hold_for_member_setup() {
return 0
fi
if [ -f "$state/git-setup.failed" ]; then
echo "git: Orca couldn't set up your GitHub identity in this workspace, so it stopped this $sub instead of making it under the wrong name. Restart the sandbox (workspace menu > Restart sandbox), then try again." >&2
printf '%s\n' "orca: Orca couldn't set up your GitHub identity in this sandbox, so it stopped \`git $sub\` rather than use the wrong identity. Restart this workspace (right-click it in the sidebar > Restart), then try again." >&2
else
echo "git: this workspace is still setting up your GitHub identity, so Orca stopped this $sub instead of making it under the wrong name. Try again in a moment; if this keeps happening, restart the sandbox (workspace menu > Restart sandbox)." >&2
printf '%s\n' "orca: Orca is still setting up your GitHub identity in this sandbox, so it stopped \`git $sub\` rather than use the wrong identity. Try again in a few seconds. If this keeps happening, restart this workspace (right-click it in the sidebar > Restart)." >&2
fi
exit 1
}
@@ -74,8 +74,9 @@ describe('the git shim while member setup is pending', () => {
writeFileSync(join(state, 'git-setup.failed'), `${now()}\n`)
const run = git(['commit', '-m', 'x'])
expect(run.status).toBe(1)
expect(run.stderr).toContain("Orca couldn't set up your GitHub identity")
expect(run.stderr).toContain('Restart sandbox')
expect(run.stderr).toBe(
"orca: Orca couldn't set up your GitHub identity in this sandbox, so it stopped `git commit` rather than use the wrong identity. Restart this workspace (right-click it in the sidebar > Restart), then try again.\n"
)
expect(reachedRealGit(run.stderr)).toBe(false)
})
@@ -83,7 +84,9 @@ describe('the git shim while member setup is pending', () => {
writeFileSync(join(state, 'git-setup.pending'), `${now()}\n`)
const run = git(['push'], 5)
expect(run.status).toBe(1)
expect(run.stderr).toContain('still setting up your GitHub identity')
expect(run.stderr).toBe(
'orca: Orca is still setting up your GitHub identity in this sandbox, so it stopped `git push` rather than use the wrong identity. Try again in a few seconds. If this keeps happening, restart this workspace (right-click it in the sidebar > Restart).\n'
)
expect(run.ms).toBeLessThan(5_000)
})