From 765ccac0f64733bfb1b802120769d6b323e1a24d Mon Sep 17 00:00:00 2001
From: Vassil Vassilev <v.g.vassilev@gmail.com>
Date: Thu, 9 May 2019 09:27:53 +0300
Subject: [PATCH] [travis] Add instructions for applying formatting changes
 inline.

This avoids bloating the history with blank space commits.
---
 .ci/format_script.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.ci/format_script.sh b/.ci/format_script.sh
index 0d74e509da2..5f884be45e5 100755
--- a/.ci/format_script.sh
+++ b/.ci/format_script.sh
@@ -18,5 +18,11 @@ else
   echo -e "\tgit checkout $TRAVIS_BRANCH"
   echo -e "\tgit-clang-format --commit $BASE_COMMIT --diff --binary $(which clang-format)"
   echo "$RESULT_OUTPUT"
+
+  echo -e "\n\nPlease apply the code formatting changes without bloating the history."
+  echo -e "\tConsider running:"
+  echo -e "\t\tgit checkout $TRAVIS_BRANCH"
+  echo -e "\t\tgit rebase -i --autosquash -x 'git-clang-format-7 master && git commit -a --amend --no-edit' master"
+
   exit 1
 fi
-- 
GitLab