Junio C Hamano <gitster@xxxxxxxxx> writes: > Karthik Nayak <karthik.188@xxxxxxxxx> writes: > >> Providing a path does work indeed. But we were discussing the option to >> provide an additional path apart from the default '.clang-format'. > > But that is not a requirement. The requirement is to allow us to > use what we have in .clang-format plus one other rule. > > And if that requirement is met by copying the entire contents in > .clang-format to a temporary file, adding the other one to the same > temporary file, and then using the temporary file instead of > .clang-format, that is fine, isn't it? Ah right. Let me summarise: - Method 1: Inject the extra config to '.clang-format' in the CI's job. This is the current method. - Method 2: Create '.clang-format-ci' to use in the CI - Method 2.a: The new file contains '.clang-format' + CI specific rules. - Method 2.b: The new file simply contains the new rules and we inject the rest in the CI's job. I'd say methods '1' and '2.b' are similar, since they modify the tree on the CI. So no real benefit of one over the other, no? The issue with method '2.a' is that we have two sources of truth and we need to ensure both files are updates always. Since the former methods don't have any cons of maintenance apart from seeming a bit hacky, I'd prefer that. But happy to go the other way too!
Attachment:
signature.asc
Description: PGP signature
