bruno/ifcurl
1
0
Fork 0
mirror of https://github.com/brunopostle/ifcurl.git synced 2026-07-12 10:18:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
ifcurl/forgejo/server-config
History
Bruno Postle 27883e468e forgejo: document ifcmerge mergeability — bare repo gitattributes finding 
Investigation confirmed: Forgejo's git merge-tree --write-tree (git ≥2.38)
does invoke configured merge drivers for .ifc files.

Key finding: bare repositories do NOT read committed .gitattributes — the
merge driver is silently skipped without a system-wide core.attributesFile.

Changes:
- server-config/gitattributes: new file to deploy at /etc/gitattributes,
  containing "*.ifc merge=ifcmerge"
- server-config/gitconfig-ifcmerge: adds [core] attributesFile = /etc/gitattributes
  and explains the bare-repo constraint
- forgejo/README.md: rewrites ifcmerge section with investigation findings,
  deployment steps, and distinction between server-side vs client-side setup

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-24 09:27:56 +01:00
..
gitattributes forgejo: document ifcmerge mergeability — bare repo gitattributes finding 2026-04-24 09:27:56 +01:00
gitconfig-ifcmerge forgejo: document ifcmerge mergeability — bare repo gitattributes finding 2026-04-24 09:27:56 +01:00
ifcurl-preview.service forgejo: systemd unit, ifcmerge driver docs; fix stale proxy mention 2026-04-24 09:17:32 +01:00