Merge branch 'next' into master

[i3/i3] / travis / check-formatting.sh

diff --git a/travis/check-formatting.sh b/travis/check-formatting.sh
index abdb11683961dc246d7727eaa028a64f60b7c504..d232339cd3c1487d508aec24396a41f254d64dfc 100755 (executable)
--- a/travis/check-formatting.sh
+++ b/travis/check-formatting.sh
@@ -1,2 +1,6 @@
 #!/bin/sh
-clang-format-3.5 -i $(find . -name "*.[ch]" | tr '\n' ' ') && git diff --exit-code || (echo 'Code was not formatted using clang-format!'; false)
+
+set -e
+set -x
+
+clang-format-4.0 -i $(find . -name "*.[ch]" | tr '\n' ' ') && git diff --exit-code || (echo 'Code was not formatted using clang-format!'; false)