Mathieu Benoit
76c548a781
git log --oneline shows only the subject, and it read in whichever language the author was thinking in. The subject and the body under it are now in English, then --- FR --- opens the French section, which starts with the subject translated under the same tag. The hook refuses a --- EN --- marker and a French section without that title, and checks the title like a subject; it does not count against the body budget. Whether the subject is really English is not checked. /commit and /git_prepare_merge follow. Checked: 55 hook tests, 7 of them new; i18n tests pass. --- FR --- [UPD] règle de commit : sujet anglais d'abord, titre FR sous --- FR --- git log --oneline ne montre que le sujet, et il se lisait dans la langue où l'auteur pensait. Le sujet et le corps qui le suit sont désormais en anglais, puis --- FR --- ouvre la section française, qui commence par le sujet traduit sous le même tag. Le hook refuse un marqueur --- EN --- et une section française sans ce titre, et juge ce titre comme un sujet ; il ne compte pas dans le budget du corps. Que le sujet soit vraiment en anglais ne se vérifie pas. /commit et /git_prepare_merge suivent. Vérifié : 55 tests du hook, dont 7 nouveaux ; tests i18n au vert. Assisted-by: Claude Opus 5.5
6.6 KiB
| name | description | disable-model-invocation | allowed-tools | |||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| git_prepare_merge | ERPLibre merge preparation: changelog entry, then the merge message for the current branch. | true |
|
Context
- Current branch: !
git branch --show-current - Branch commits: !
git log --oneline $(git merge-base HEAD master)..HEAD - Files touched: !
git diff --stat $(git merge-base HEAD master)..HEAD - Working tree: !
git status --porcelain - Changelog head: !
sed -n '24,45p' CHANGELOG.base.md
Task
Prepare the merge of the CURRENT branch into its integration branch. Two
deliverables, in this order: the changelog entry, then the merge message.
Nothing is merged here — /git_prepare_merge prepares, the human merges.
0. Read the branch
master is production, develop is where the work lands. Take the target
from where the branch forked: git merge-base HEAD develop and
git merge-base HEAD master, the closer of the two names the target.
Read the WHOLE branch before writing a word — git log -p <base>..HEAD for
the commits, git diff <base>..HEAD for the net result. A merge message
summarises what the branch delivers, which is rarely the concatenation of its
subjects: commits that undo each other cancel, and a fix to a feature added on
the same branch is part of the feature, not a separate line.
Stop and say so, rather than inventing, when the branch is empty, when it is already merged, or when the working tree carries changes not yet committed — uncommitted work is not part of the merge and must not be described as if it were.
1. The changelog entry
CHANGELOG.base.md at the repository root is the SOURCE. CHANGELOG.md and
CHANGELOG.fr.md are generated by mmg and every direct edit to them is lost
at the next make doc_markdown — never open them to write.
The entry goes under ## [Unreleased], in the section that fits: Added /
Ajouté, Changed / Modifié, Fixed / Corrigé, Removed / Retiré, Security /
Sécurité. Create the pair of headings if the section does not exist yet, in
the file's own order.
The file alternates language blocks with markers. Within one section the
English bullets sit under <!-- [en] --> and the French translation under
<!-- [fr] -->, in the SAME order: the two lists are read side by side, and a
bullet added to one language only leaves the other half wrong. Nothing goes
under <!-- [common] --> but the version headings.
What a bullet says: what the software now DOES or REFUSES, in the present, for someone who was not on this branch. It is longer than a commit subject and shorter than the commit body — the reader is choosing whether to upgrade, not reviewing the diff. Keep the failure mode removed, the figure that bounds it, the flag or the file a user has to know. Drop the internals nobody outside calls.
The two rules of .claude/rules/04-code-conventions.md hold here as
everywhere: nothing identifying — no customer, no real database, no host, no
address, no account path — and the code as the subject, never the session
that produced it.
Regenerate afterwards, and stage the three files together, the generated pair being what most readers actually open:
make doc_markdown
git status --porcelain CHANGELOG.base.md CHANGELOG.md CHANGELOG.fr.md
2. The merge message
Resolve {MODEL} exactly as /commit does — the trailer is required here
too, a merge message being as AI-assisted as any other. Run:
python3 -c "
import glob, json, os, sys
sid = os.environ.get('CLAUDE_CODE_SESSION_ID', '')
hits = glob.glob(os.path.expanduser('~/.claude/projects/*/%s.jsonl' % sid)) if sid else []
mid = ''
for path in hits[:1]:
with open(path) as fh:
for line in fh:
try:
m = json.loads(line).get('message', {}).get('model', '')
except Exception:
continue
if m and not m.startswith('<'):
mid = m
if not mid:
sys.exit('UNKNOWN')
mid = mid.removeprefix('claude-')
parts = [p for p in mid.split('-') if not (len(p) == 8 and p.isdigit())]
print('Claude %s %s' % (parts[0].capitalize(), '.'.join(parts[1:])))
"
The shape, as this repository writes it:
Merge branch '<branch>'
[TAG] scope: what the branch delivers, in English, 72 characters maximum
<N> commits. Why the branch existed: the failure mode it removes, the
figure that bounds it, what was verified and how. Wrap at 80 characters.
--- FR ---
[TAG] portée : ce que livre la branche, traduit en français
The same body, translated.
Assisted-by: {MODEL}
The first line stays Merge branch '<branch>' — git writes it, tools read it,
and a merge whose first line says something else no longer looks like a merge
in git log --oneline. The tagged line beneath it is what a reader gets from
--oneline on the second row and from a release note, so it carries the same
duty as a commit subject: name the part of the system, then what is now
different about it. The evidence — the symptom, the quoted error, the
metaphor — belongs in the body.
The body: the same budget as a commit, per language, and here a merge covers
several commits, so it is a SUMMARY and not a list. Open by stating how many
commits the branch carries, then say what they add up to. No bullet list, no
per-commit rundown: git log <base>..HEAD already gives that, and a body
repeating it teaches nothing.
The bilingual rule holds as for a commit — the tagged line and the body in
English, then --- FR ---, then the tagged line translated under the same
tag, then the translated body — as does the ban on naming an AI in
Co-authored-by:.
The hook does not check this one. script/git/hooks/commit-msg skips any
message beginning with Merge , along with Revert , fixup! and squash!.
Length, addresses, account paths and the order of the languages pass
unchallenged here, so the discipline is entirely yours.
3. Hand it over
Write the message to tasks/merge_message.txt — tasks/ is not versioned,
which is why the repository sends working material there — and print the two
commands the human runs, with --no-ff so the branch keeps a merge commit and
its history stays readable:
git switch <target>
git merge --no-ff <branch> -F tasks/merge_message.txt
Do not run them. Do not switch branch, do not merge, do not push: the merge is the human's decision and the last chance to read the message before it is permanent. Report, in a sentence each, the changelog section written to and the number of commits summarised.