From 1b7d42c99ee80658748080d4e18dd544136bf3bf Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Wed, 25 Aug 2021 17:05:16 +0200 Subject: [PATCH] Print colored diffs when there are formatting failures in CI This makes diffs more readable in CI logs. (cherry picked from commit 38424714b1d3c7e35fb0cb2de548338885a98c14) --- misc/scripts/black_format.sh | 2 +- misc/scripts/clang_format.sh | 2 +- misc/scripts/file_format.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/misc/scripts/black_format.sh b/misc/scripts/black_format.sh index f93e8cbc2a7..2ad9a238326 100755 --- a/misc/scripts/black_format.sh +++ b/misc/scripts/black_format.sh @@ -15,7 +15,7 @@ PY_FILES=$(find \( -path "./.git" \ \) -print) black -l 120 $PY_FILES -git diff > patch.patch +git diff --color > patch.patch # If no patch has been generated all is OK, clean up, and exit. if [ ! -s patch.patch ] ; then diff --git a/misc/scripts/clang_format.sh b/misc/scripts/clang_format.sh index 63c66d41c32..bcd63aa73ba 100755 --- a/misc/scripts/clang_format.sh +++ b/misc/scripts/clang_format.sh @@ -40,7 +40,7 @@ while IFS= read -rd '' f; do done done -git diff > patch.patch +git diff --color > patch.patch # If no patch has been generated all is OK, clean up, and exit. if [ ! -s patch.patch ] ; then diff --git a/misc/scripts/file_format.sh b/misc/scripts/file_format.sh index 5f4d69a2854..be84daa7f4d 100755 --- a/misc/scripts/file_format.sh +++ b/misc/scripts/file_format.sh @@ -44,7 +44,7 @@ while IFS= read -rd '' f; do perl -i -pe 's/\x20== true//g' "$f" done -git diff > patch.patch +git diff --color > patch.patch # If no patch has been generated all is OK, clean up, and exit. if [ ! -s patch.patch ] ; then