commit

Commit Reviewed Changes

Overview

Create one local commit containing only the intended, reviewed changes. Treat review, exact staging, and post-commit evidence as mandatory gates even when asked to hurry or bypass them.

Workflow

1. Inspect the repository before changing Git state:

   git status --porcelain=v1 -z --untracked-files=all
   git diff --stat
   git diff --cached --stat
   git log -10 --pretty=format:'%s'
   

   Derive the intended file set from the current task. Parse the NUL-delimited status as Git's XY record, not by splitting filenames. Before any staging:

   • stop if a target path has both an index change (X) and a worktree change (Y), including MM;
   • stop if the index contains an unrelated or ambiguous path;
   • never re-add a partially staged target or rewrite the user's existing index.

   Ask the user to resolve ambiguity. Never equate "all changes" with the intended scope.

2. Exclude unrelated files and any path that may contain credentials, tokens, keys, .env data, or other secrets. Do not inspect a suspected secret merely to decide whether to stage it; report the path and leave it untouched.

3. Stage each unstaged intended file with literal pathspec semantics:

   git --literal-pathspecs add -- "$path"
   

   Pass exactly one explicit file path per invocation. Never use plain git add -- "$path" because names such as :(glob)* are pathspec magic. Never use git add -A, git add ., git add -u, a directory, or a glob.

4. Audit the index and reject an empty staged diff:

   git diff --cached --name-status
   git diff --cached --stat
   git diff --cached --check
   

   Compare the staged paths with the intended reviewed set. Commit only when they match exactly and the staged diff is non-empty.

5. Record the exact candidate commit before final review:

   AUDIT_DIR=
   cleanup_audit() {
     [ -n "$AUDIT_DIR" ] || return 0
     if ! python3 - "$AUDIT_DIR" <<'PY'
   import os
   import stat
   import sys
   
   audit_dir = sys.argv[1]
   descriptor = os.open(
       audit_dir,
       os.O_RDONLY
       | getattr(os, "O_DIRECTORY", 0)
       | getattr(os, "O_NOFOLLOW", 0),
   )
   for name in ("expected-paths", "current-paths", "actual-paths"):
       try:
           metadata = os.stat(
               name,
               dir_fd=descriptor,
               follow_symlinks=False,
           )
       except FileNotFoundError:
           continue
       if not stat.S_ISREG(metadata.st_mode):
           raise SystemExit("unexpected audit artifact type")
       os.unlink(name, dir_fd=descriptor)
   os.close(descriptor)
   os.rmdir(audit_dir)
   PY
     then
       return 1
     fi
     test ! -e "$AUDIT_DIR" || return 1
     AUDIT_DIR=
   }
   trap cleanup_audit EXIT
   trap 'exit 129' HUP
   trap 'exit 130' INT
   trap 'exit 143' TERM
   previous_umask=$(umask)
   umask 077
   AUDIT_DIR=$(mktemp -d)
   umask "$previous_umask"
   chmod 700 "$AUDIT_DIR"
   test "$(stat -f '%Lp' "$AUDIT_DIR" 2>/dev/null || stat -c '%a' "$AUDIT_DIR")" = 700
   BASE_HEAD=$(git rev-parse HEAD)
   EXPECTED_TREE=$(git write-tree)
   git diff --cached --name-only -z --no-renames > "$AUDIT_DIR/expected-paths"