john/claude-engineering-plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: add default-branch guard to commit skills (#386)

Browse Source
This commit is contained in:
Trevin Chow
2026-03-25 21:41:17 -07:00
committed by GitHub
parent f819e435a5
commit 31f07c0047
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/compound-engineering/skills/git-commit-push-pr/SKILL.md
View File

@@ -18,8 +18,17 @@ command git status
command git diff HEAD command git diff HEAD
command git branch --show-current command git branch --show-current
command git log --oneline -10 command git log --oneline -10
command git rev-parse --abbrev-ref origin/HEAD
``` ```
The last command returns the remote default branch (e.g., `origin/main`). Strip the `origin/` prefix to get the branch name. If the command fails or returns a bare `HEAD`, try:
```bash
command gh repo view --json defaultBranchRef --jq '.defaultBranchRef.name'
```
If both fail, fall back to `main`.
If there are no changes, report that and stop. If there are no changes, report that and stop.
### Step 2: Determine conventions ### Step 2: Determine conventions
@@ -47,7 +56,7 @@ Interpret the result:
### Step 4: Branch, stage, and commit ### Step 4: Branch, stage, and commit
1. If on `main` or the repo's default branch, create a descriptive feature branch first (`command git checkout -b <branch-name>`). Derive the branch name from the change content. 1. If on `main`, `master`, or the resolved default branch from Step 1, create a descriptive feature branch first (`command git checkout -b <branch-name>`). Derive the branch name from the change content.
2. Before staging everything together, scan the changed files for naturally distinct concerns. If modified files clearly group into separate logical changes (e.g., a refactor in one set of files and a new feature in another), create separate commits for each group. Keep this lightweight -- group at the **file level only** (no `git add -p`), split only when obvious, and aim for two or three logical commits at most. If it's ambiguous, one commit is fine. 2. Before staging everything together, scan the changed files for naturally distinct concerns. If modified files clearly group into separate logical changes (e.g., a refactor in one set of files and a new feature in another), create separate commits for each group. Keep this lightweight -- group at the **file level only** (no `git add -p`), split only when obvious, and aim for two or three logical commits at most. If it's ambiguous, one commit is fine.
3. Stage relevant files by name. Avoid `git add -A` or `git add .` to prevent accidentally including sensitive files. 3. Stage relevant files by name. Avoid `git add -A` or `git add .` to prevent accidentally including sensitive files.
4. Commit following the conventions from Step 2. Use a heredoc for the message. 4. Commit following the conventions from Step 2. Use a heredoc for the message.

11
plugins/compound-engineering/skills/git-commit/SKILL.md
View File

@@ -18,10 +18,21 @@ command git status
command git diff HEAD command git diff HEAD
command git branch --show-current command git branch --show-current
command git log --oneline -10 command git log --oneline -10
command git rev-parse --abbrev-ref origin/HEAD
``` ```
The last command returns the remote default branch (e.g., `origin/main`). Strip the `origin/` prefix to get the branch name. If the command fails or returns a bare `HEAD`, try:
```bash
command gh repo view --json defaultBranchRef --jq '.defaultBranchRef.name'
```
If both fail, fall back to `main`.
If there are no changes (nothing staged, nothing modified), report that and stop. If there are no changes (nothing staged, nothing modified), report that and stop.
If the current branch matches `main`, `master`, or the resolved default branch name, warn the user and ask whether to continue committing here or create a feature branch first. Use the platform's blocking question tool (`AskUserQuestion` in Claude Code, `request_user_input` in Codex, `ask_user` in Gemini). If no question tool is available, present the options and wait for the user's reply before proceeding. If the user chooses to create a branch, derive the name from the change content and switch to it before continuing.
### Step 2: Determine commit message convention ### Step 2: Determine commit message convention
Follow this priority order: Follow this priority order: