Skip to content

Commit 1f66d45

Browse files
committed
fix(hook): update error message to include ignored files in check-push script
1 parent 844a9c8 commit 1f66d45

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

‎.claude/hooks/check-push.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ fi
4242
printf '%s\n' "$output" >&2
4343
printf '\nHEAD のクリーンな checkout で bun run ci が失敗しました (作業ツリーでは通っていても)。\n' >&2
4444
printf '未コミットのファイルや、.gitignore に巻き込まれたファイルにテストが依存していないか確かめてください:\n' >&2
45-
printf ' git status --short\n comm -13 <(git ls-files app | sort) <(find app -type f | sort)\n' >&2
45+
printf ' git status --short --ignored\n' >&2
4646
exit 2

‎.claude/skills/gh-stack/SKILL.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ git config remote.pushDefault origin # if multiple remotes exist (skips remo
5757
3. **Always use `--json` with `gh stack view`.** Without `--json`, the command launches an interactive TUI that cannot be operated by agents. There is no other appropriate flag — always pass `--json`.
5858
4. **Handle multiple remotes.** If more than one remote is configured, pre-configure `git config remote.pushDefault origin`, or pass `--remote <name>` to the commands that accept it: `push`, `submit`, `sync`, `rebase`, and `link`. `checkout`, `modify`, and `trunk` resolve a remote but have **no `--remote` flag** — they rely on `remote.pushDefault`. With multiple remotes and no configured default, these commands exit with an error in non-interactive mode.
5959
5. **Avoid branches shared across multiple stacks.** If a branch belongs to multiple stacks, commands exit with code 6. Check out a non-shared branch first.
60-
6. **Plan your stack layers by dependency order before writing code.** Foundational changes (models, APIs, shared utilities) go in lower branches; dependent changes (UI, consumers) go in higher branches. Think through the dependency chain before running `gh stack init`.
60+
6. **Order stack layers by dependency.** Foundational changes (models, APIs, shared utilities) go in lower branches; dependent changes (UI, consumers) go in higher branches, because each branch's PR is reviewed against the branch below it.
6161
7. **Use standard `git add` and `git commit` for staging and committing.** This gives you full control over which changes go into each branch. The `-Am` shortcut is available but should not be the default approach—stacked PRs are most effective when each branch contains a deliberate, logical set of changes.
6262
8. **Navigate down the stack when you need to change a lower layer.** If you're working on a frontend branch and realize you need API changes, don't hack around it at the current layer. Navigate to the appropriate branch (`gh stack down`, `gh stack checkout`, or `gh stack bottom`), make and commit the changes there, run `gh stack rebase --upstack`, then navigate back up to continue.
6363
9. **Use `gh stack link` for external tool workflows.** When branches are managed by an external tool (jj, Sapling, etc.), use `gh stack link branch-a branch-b`. `link` does not rely on local tracking state and is intended for API-driven PR and stack management. Provide at least two branches/PRs to create or update a stack, or a stack number followed by the new branches/PRs to append them to the top of an existing stack (e.g. `gh stack link 7 branch-c`).

0 commit comments

Comments
 (0)