fix(execute): glob loops in the wave blocks survive zsh's NOMATCH (green)
Check 4, Step 2a' and Step 5 start with
`[ -n "${ZSH_VERSION:-}" ] && setopt nonomatch`, so an unmatched
session-* glob stays literal under zsh as it does under bash and the
existing `[ -d "$wt" ] || continue` guard skips it. null_glob was not
used: it turns `ls -d .../session-*` into `ls -d`, which lists `.`.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
a61cde2b38
commit
7439dac927
1 changed files with 6 additions and 0 deletions
|
|
@ -505,6 +505,8 @@ refuses an unmerged branch: both are kept, reported, and never retried with
|
|||
force.
|
||||
|
||||
```bash
|
||||
# zsh (the Bash tool runs the user's shell): an unmatched glob stays literal, as in bash.
|
||||
[ -n "${ZSH_VERSION:-}" ] && setopt nonomatch
|
||||
GIT_DIR_ABS="$(cd "$(git rev-parse --git-dir)" && pwd -P)"
|
||||
GIT_COMMON_ABS="$(cd "$(git rev-parse --git-common-dir)" && pwd -P)"
|
||||
MAIN_ROOT="$(git worktree list --porcelain | sed -n '1s/^worktree //p')"
|
||||
|
|
@ -692,6 +694,8 @@ Insert this block AFTER the worktree-creation loop and BEFORE the orders are
|
|||
written (Step 2):
|
||||
|
||||
```bash
|
||||
# zsh (the Bash tool runs the user's shell): an unmatched glob stays literal, as in bash.
|
||||
[ -n "${ZSH_VERSION:-}" ] && setopt nonomatch
|
||||
PROJECT_SOURCE="$(realpath "${PROJECT_DIR}")"
|
||||
REPO_ROOT_REAL="$(realpath "${REPO_ROOT}")"
|
||||
# Compute destination relpath: PROJECT_DIR relative to REPO_ROOT.
|
||||
|
|
@ -924,6 +928,8 @@ copies and the merged-waves record stay until the main-merge gate's confirm
|
|||
(Phase 8) clears them.
|
||||
|
||||
```bash
|
||||
# zsh (the Bash tool runs the user's shell): an unmatched glob stays literal, as in bash.
|
||||
[ -n "${ZSH_VERSION:-}" ] && setopt nonomatch
|
||||
cd "$REPO_ROOT" || exit 1
|
||||
|
||||
# Remove worktrees git agrees are clean (GIT_OPTIONAL_LOCKS=0 to avoid lock-file races)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue