Merged pull request mongodb#766

Author: derickr

.clang-format

@@ -46,7 +46,6 @@ DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros: []
-IncludeBlocks: Preserve
 IncludeCategories: 
   - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
     Priority:        2
@@ -55,7 +54,6 @@ IncludeCategories:
   - Regex:           '.*'
     Priority:        1
 IndentCaseLabels: true
-IndentPPDirectives: None
 IndentWidth:     4
 IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: true

scripts/clang-format.sh

@@ -12,6 +12,28 @@ if test x"$1" = xchanged; then
 	FILES="$FILES1 $FILES2 $FILES3"
 fi
 
+# Find clang-format, we prefer -6.0, but also allow binaries without -suffix as
+# long as they're >= 6.0.0
+CLANG_FORMAT=`which clang-format-6.0`
+
+if [ -z "$CLANG_FORMAT" ]; then
+	CLANG_FORMAT=`which clang-format`
+fi
+
+if [ -z "$CLANG_FORMAT" ]; then
+	echo "Couldn't find clang-format"
+	exit
+fi
+
+VERSION=`$CLANG_FORMAT -version | cut -d " " -f 3`
+VERSION_MAJOR=`echo $VERSION | cut -d "." -f 1`
+
+if [ $VERSION_MAJOR -lt 6 ]; then
+	echo "Found clang-format $VERSION but we need >= 6.0.0"
+	exit
+fi
+
+# Run formatter
 for i in $FILES; do
-	clang-format-7 -i $i
+	$CLANG_FORMAT -i $i
 done