odoo-commit

Workflow

1. Run git diff --stat and git status --short to see what changed, plus git log -1 --oneline (and git log @{u}.. --oneline if a remote-tracking branch exists) to see the last local commit and whether it's still unpushed.

2. If the change is a direct continuation or fix of that unpushed HEAD commit, skip drafting a new message and fold it in instead of creating a second commit for the same logical change:

   git add <file>
   git commit --amend --no-edit   # or drop --no-edit to also revise the message
   

   Otherwise, draft a new commit message.

3. Stage relevant files by name - never git add -A or git add ..

4. Write the commit message to a temporary file, then commit with git commit -F:

cat > /tmp/odoo-commit-message.txt <<'EOF'
[TAG] module: short description

Optional body line.
EOF
git commit -F /tmp/odoo-commit-message.txt

Any equivalent temp-file flow is fine (for example, using PowerShell's Set-Content or another editor) as long as the final commit is created with git commit -F <file>.

1. Before opening a pull request, squash your own back-and-forth commits into one clean commit per logical change (per OCA guidelines): the rest of the world doesn't need your intermediate "fix bug 1", "fix bug 2" history - only the final state and a clear summary. For a single trailing fix, git commit --amend (step 2) is usually enough; for folding several commits into one, use an interactive rebase instead:

   git rebase -i HEAD~N   # N = number of commits to fold
   

   Keep the first line as pick with the real [TAG] module: description message, mark the rest fixup (drop their messages) or squash (merge messages):

   pick 1949129 [IMP] module: Introduce feature A
   fixup d2cf643 Fix bug 1 of feature A
   fixup 42bd9e8 Fix bug 2 of feature A
   fixup 7f767d5 Fix bug 3 of feature A
   

   Either way, only rewrite commits that are still local/unpushed, or on a branch you alone own - never amend or rebase shared history without confirming with the user first.

2. Report the resulting commit hash and subject.

Do not bypass pre-commit hooks. If a hook fails, fix the issue, re-stage the changes, and create the commit again.