git-fixup-push

name	git-fixup-push
description	Combines all git commits for a change into a single commit and pushes it to gerrit. Use when you push to gerrit.
license	Apache-2.0
metadata	{"version":"1.0"}

Fixup Git Commits and Push to Gerrit

Use git-fixup-push when you have multiple commits for a change and want to combine them into a single commit before pushing to gerrit. Changes to Impala are managed in gerrit, and each change is represented as a single git commit. Use git-fixup-push to meld multiple commits into a single commit that can be pushed to gerrit.

Deterministic Execution Contract

• Run all commands from the repository root in a single shell session.
• Use non-interactive commands only.
• Treat any non-zero command exit code as a failure for the current step unless the step explicitly defines recovery behavior.
• Do not use force operations (--force, --force-with-lease, hard reset).
• Do not run git remote -v.
• Ignore untracked files for staged/unstaged detection and for stashing decisions.

Canonical Checks

• Staged changes exist: git diff --cached --quiet (exit code 1 means staged changes exist).
• Unstaged tracked changes exist: git diff --quiet (exit code 1 means unstaged tracked changes exist).
• Most recent commit message: git log -1 --pretty=%B.
• Valid gerrit username regex: ^[A-Za-z0-9._-]+$.
• Remote URL checks:
  • Fetch URL: git remote get-url asf-gerrit
  • Push URL: git remote get-url --push asf-gerrit

Available Scripts

• .agents/skills/git-fixup-push/scripts/fixup.sh - Script to combine multiple commits into a single commit. Run with the --help argument to see usage instructions. Run with the --dry-run argument to see the exact command that would be executed without actually running it. The script selects commits from the most recent IMPALA-<id> commit through HEAD. If that matching commit is already HEAD, the script exits without squashing.

Workflow

• Step 1: Validate asf-gerrit remote and URLs.
  • Success condition: both effective URLs exactly match ssh://<username>@gerrit.cloudera.org:29418/Impala-ASF.
  • Procedure:
    • Try git remote get-url asf-gerrit and git remote get-url --push asf-gerrit.
    • If remote does not exist, ask once for <username>.
    • Validate <username> against ^[A-Za-z0-9._-]+$.
    • If <username> is invalid, abort.
    • If remote does not exist and <username> is valid, run:
      • git remote add asf-gerrit ssh://<username>@gerrit.cloudera.org:29418/Impala-ASF
    • If remote exists but URL mismatch is detected, ask once for <username>.
    • Validate <username> against ^[A-Za-z0-9._-]+$.
    • If <username> is invalid, abort.
    • If remote exists with URL mismatch and <username> is valid, run:
      • git remote set-url asf-gerrit ssh://<username>@gerrit.cloudera.org:29418/Impala-ASF
      • git remote set-url --push asf-gerrit ssh://<username>@gerrit.cloudera.org:29418/Impala-ASF
    • Re-run both URL checks. If either still mismatches, abort.
• Step 2: Commit already-staged changes (pre-existing index state).
  • Run staged check.
  • If staged changes exist, run:
    • git commit -m "WIP: commit staged files"
  • If no staged changes, continue.
• Step 3: Resolve unstaged tracked changes.
  • Run unstaged tracked check.
  • If no unstaged tracked changes, continue.
  • If unstaged tracked changes exist, ask user to choose exactly one action:
    • stage: run exactly git add -u
    • stash: run git stash push --keep-index -m "stashed by git-fixup-push skill". Record that a stash was created; Step 9 will pop it after a successful push.

Gotchas

• Gerrit requires Change-Id: to be in the final footer paragraph of the commit message. Keep all trailer lines contiguous in that last paragraph (for example, Change-Id: and Assisted-by: should be adjacent, with no blank line between them).
• Git may not have remote.<name>.pushurl explicitly set. In that case, git remote get-url --push <name> may still resolve via remote.<name>.url.
• git stash push --keep-index stashes only unstaged tracked changes and preserves staged changes for the next commit step.