From: Martin Quinson Date: Fri, 14 Oct 2016 22:21:32 +0000 (+0200) Subject: cosmetics in clang-format X-Git-Tag: v3_14~333 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/40d409482f943e69b8aa28a5f9ea13363242501c cosmetics in clang-format --- diff --git a/.clang-format b/.clang-format index d312e2205c..bcdc0c1da3 100644 --- a/.clang-format +++ b/.clang-format @@ -34,10 +34,10 @@ BraceWrapping: BreakBeforeBinaryOperators: None BreakBeforeBraces: Custom BreakBeforeTernaryOperators: true -BreakConstructorInitializersBeforeComma: false +BreakConstructorInitializersBeforeComma: true ColumnLimit: 120 CommentPragmas: '^ IWYU pragma:' -ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerAllOnOneLineOrOnePerLine: true ConstructorInitializerIndentWidth: 4 ContinuationIndentWidth: 4 Cpp11BracedListStyle: true diff --git a/tools/git-hooks/clang-format.pre-commit b/tools/git-hooks/clang-format.pre-commit index 5e19f14614..fdedc56c44 100755 --- a/tools/git-hooks/clang-format.pre-commit +++ b/tools/git-hooks/clang-format.pre-commit @@ -53,7 +53,7 @@ if [ -z $GIT_SUBCOMMAND ] ; then fi # remove any older patches from previous commits. Set to true or false. -DELETE_OLD_PATCHES=false +DELETE_OLD_PATCHES=true # only parse files with the extensions in FILE_EXTS. Set to true or false. # if false every changed file in the commit will be parsed with clang-format.