Merge pull request #1403 from lscheinkman/NUP-2495

NUP-2495: Fix bamboo style check
numenta · Mar 9, 2018 · d72f0ef · d72f0ef
2 parents a8fd7d2 + bfe6ed1
commit d72f0ef
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/ci/bamboo/check-style.sh b/ci/bamboo/check-style.sh
@@ -22,12 +22,12 @@
 
 set -o errexit
 
-if git clang-format --diff -- | grep -q '^diff'
+if git clang-format --diff master | grep -q '^diff'
 then
-    echo "ERROR: Code changes do not comply with the clang-format rules."
+    echo "ERROR: Code changes do not comply with numenta's code style rules."
     echo "Please run 'git clang-format' before commit."
+    git clang-format --diff master
     exit 1
 fi
-
 exit 0