The clang-format CI job is currently cluttered due to too many errors being reported. See some of the examples here: * https://gitlab.com/gitlab-org/git/-/jobs/7854601948 * https://gitlab.com/gitlab-org/git/-/jobs/7843131109 So modify the clang-format with the following changes: 1. Modify the penalties for linebreaks to be more considerate towards readability. The commit goes into detail explaining how/why. 2. Align the macro definitions. This is something we follow to keep the macros readable. I will still keep monitoring the jobs from time to time to ensure we can fine tune more as needed, if someone see's something odd, do keep me in the loop. Thanks Changes over the previous version: 1. I made the example in the first commit message a bit clearer so it is easier to understand. 2. Removed the third commit, since I was convinced that it is good as-is for now. Karthik Nayak (2): clang-format: re-adjust line break penalties clang-format: align consecutive macro definitions .clang-format | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) Range-diff against v3: 1: 74bbd2f9db ! 1: a8c8df5d95 clang-format: re-adjust line break penalties @@ Commit message to instead have something more readable like: static const struct strbuf *a_really_really_large_function_name(struct strbuf resolved, - const char *path, int flags) + const char *path, + int flags) + + (note: the tabs here have been replaced by spaces for easier reading) This is done by bumping the values of 'PenaltyReturnTypeOnItsOwnLine' and 'PenaltyBreakOpenParenthesis' to 300. This is so that we can allow a 2: 1586d53769 = 2: fcf965ac74 clang-format: align consecutive macro definitions 3: 36a53299c1 < -: ---------- clang-format: don't align expressions after linebreaks -- 2.47.0
