[libcxx-commits] [libcxx] [libc++] Add a merge driver that can apply clang-format (PR #73712)

Bruno De Fraine via libcxx-commits libcxx-commits at lists.llvm.org
Fri Dec 1 08:00:01 PST 2023


brunodf-snps wrote:

> I wonder if that's a bit overkill for us. I expect this to be mostly a one-shot deal, I wouldn't really expect this script to stay around after the original clang-format run. I also expect that very few people will actually want to install this merge driver -- basically only contributors who have a lot of patches to rebase across the change, and maybe some downstream integrators will install it as a one-shot thing to deal with the large initial reformatting. But if you think it's useful for this to be more robust / cross-platform, I can easily migrate to Python.

Bash is fine for me. I agree this merge driver will only occasionally be needed. In fact, it would not be bad if you could enable it for individual `git merge` or `git rebase` invocations with some command-line option. Perhaps that can be done with [git -c](https://git-scm.com/docs/git#Documentation/git.txt--cltnamegtltvaluegt) on those invocations, but I don't immediately see how.

https://github.com/llvm/llvm-project/pull/73712


More information about the libcxx-commits mailing list