git-commit

Git Commit (Safety Enhanced, Angular Convention)

Create a commit from the current working tree with safety gates first, then generate a concise Angular-style message in English.

Hard Rules

• Never commit with unresolved conflicts.
• Never commit secrets, credentials, keys, or .env sensitive values.
• Subject line must be <= 50 characters total (including type(scope): ).
• Do not use --amend unless explicitly requested. If already pushed, warn about force push.
• If any safety gate fails, stop and report clearly.
• One commit = one logical change. Do not mix unrelated fixes, features, or formatting.

Workflow

Bundled scripts are always invoked as bash "<path-to-skill>/scripts/<name>.sh" — <path-to-skill> is the absolute skill directory (where this SKILL.md was loaded from), never a path relative to the repository. Keep the working directory at the target repo root; the scripts read the repo through git.

1. Preflight

git rev-parse --is-inside-work-tree                 # must print "true"
git status --short
BRANCH=$(git rev-parse --abbrev-ref HEAD)            # "HEAD" means detached (allowed)

# In-progress operation? Worktree-safe: resolve real paths, never read .git/ directly.
for state in rebase-merge rebase-apply MERGE_HEAD CHERRY_PICK_HEAD REVERT_HEAD; do
  [ -e "$(git rev-parse --git-path "$state")" ] && echo "IN_PROGRESS $state"
done

# Unresolved conflicts: this diff exits 0 regardless, so act on OUTPUT, not exit code.
git diff --name-only --diff-filter=U

STOP (hard block — report which one and what to resolve) if any of these hold:

• --is-inside-work-tree did not print true;
• any IN_PROGRESS <state> line printed (rebase / merge / cherry-pick / revert in progress);
• the conflict diff printed any path (unresolved merge conflicts).

A detached HEAD is not a stop condition — proceed and note it in the report.

2. Staging

• Snapshot what is already staged first: git diff --cached --name-only. If files are already staged that the user did not ask to commit, STOP and ask — commit them together, keep them staged for later, or split. Never silently fold pre-staged files into this commit.
• If the user names exact files, stage those only with git add -- <paths> (the -- keeps a path that starts with - from being parsed as an option).
• If the user says "commit my changes", start from git status --short.
• Count changed paths. If > 8 files, always list the full file set and ask for confirmation before staging anything.
• If <= 8 files, read the diffs and split by logical intent. If one file mixes intents, use git add -p.
• Stage task-related untracked files only when they clearly belong to the same change.
• If unstaged or untracked changes remain after staging, the quality gate MUST run through the isolation wrapper (§4) so it sees exactly the staged snapshot and your changes are restored on every exit path.
• Verify staging with git diff --cached --stat. If nothing is staged, stop.
• Run git diff --cached --submodule=short. If a submodule pointer changed, confirm it is intentional.