mirror of
https://github.com/git/git.git
synced 2026-01-10 18:20:27 +00:00
Merge branch 'kn/ci-clang-format-tidy'
Updates the '.clang-format' to match project conventions. * kn/ci-clang-format-tidy: clang-format: align consecutive macro definitions clang-format: re-adjust line break penalties
This commit is contained in:
@@ -32,6 +32,9 @@ AlignConsecutiveAssignments: false
|
||||
# double b = 3.14;
|
||||
AlignConsecutiveDeclarations: false
|
||||
|
||||
# Align consecutive macro definitions.
|
||||
AlignConsecutiveMacros: true
|
||||
|
||||
# Align escaped newlines as far left as possible
|
||||
# #define A \
|
||||
# int aaaa; \
|
||||
@@ -209,13 +212,14 @@ KeepEmptyLinesAtTheStartOfBlocks: false
|
||||
|
||||
# Penalties
|
||||
# This decides what order things should be done if a line is too long
|
||||
PenaltyBreakAssignment: 10
|
||||
PenaltyBreakBeforeFirstCallParameter: 30
|
||||
PenaltyBreakComment: 10
|
||||
PenaltyBreakAssignment: 5
|
||||
PenaltyBreakBeforeFirstCallParameter: 5
|
||||
PenaltyBreakComment: 5
|
||||
PenaltyBreakFirstLessLess: 0
|
||||
PenaltyBreakString: 10
|
||||
PenaltyExcessCharacter: 100
|
||||
PenaltyReturnTypeOnItsOwnLine: 60
|
||||
PenaltyBreakOpenParenthesis: 300
|
||||
PenaltyBreakString: 5
|
||||
PenaltyExcessCharacter: 10
|
||||
PenaltyReturnTypeOnItsOwnLine: 300
|
||||
|
||||
# Don't sort #include's
|
||||
SortIncludes: false
|
||||
|
||||
Reference in New Issue
Block a user