From ec61d1f0122ae71e60290762bab690f7b5733310 Mon Sep 17 00:00:00 2001
From: ebbit1q <ebbit1q@gmail.com>
Date: Wed, 21 Nov 2018 21:18:01 +0100
Subject: [PATCH] travis ci format check hotfix (#3449)

* set error message to be conditional

#3443 fails on the git merge base for "some reason" but at least this error message should be clearer.

* fix issues created earlier in #3433

split version from actual diff
remove --color-diff argument as apparently it isn't supported
---
 .ci/travis-compile.sh | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.ci/travis-compile.sh b/.ci/travis-compile.sh
index 7adc99c34..4aa1c1aa9 100644
--- a/.ci/travis-compile.sh
+++ b/.ci/travis-compile.sh
@@ -36,6 +36,10 @@ while [[ "$@" ]]; do
       shift
       ;;
     *)
+      if [[ $1 == -* ]]; then
+        echo "unrecognized option: $1"
+        exit 3
+      fi
       BUILDTYPE="$1"
       shift
       ;;
@@ -45,8 +49,8 @@ done
 # Check formatting using clang-format
 if [[ $CHECK_FORMAT ]]; then
   echo "Checking your code using clang-format..."
-  if ! diff="$(./clangify.sh --color-diff --cf-version)"; then
-    cat <<EOM
+  if ! diff="$(./clangify.sh --diff --cf-version)"; then
+    [[ $? == 1 ]] && cat <<EOM
 ***********************************************************
 ***                                                     ***
 ***    Your code does not comply with our styleguide.   ***
@@ -59,8 +63,13 @@ if [[ $CHECK_FORMAT ]]; then
 ***                                                     ***
 ***********************************************************
 
+Used clang-format version:
+${diff%%
+*}
+
 The following changes should be made:
-$diff
+${diff#*
+}
 
 Exiting...
 EOM