What about using something like https://github.com/bengardner/uncrustify in a git-hook to impose a consistent coding-style?