Get better output for clang-format diffs

9 years ago · 482234f456
parent 64195a7ded
commit 482234f456
1 changed files with 9 additions and 1 deletions
--- a/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh
+++ b/tools/dockerfile/grpc_clang_format/clang_format_all_the_things.sh
@ -52,9 +52,17 @@ if [ "x$TEST" = "x" ]
 then
  echo $files | xargs $CLANG_FORMAT -i
 else
+  ok=yes
  for file in $files
  do
-    $CLANG_FORMAT $file | diff $file -
+    tmp=`mktemp`
+    $CLANG_FORMAT $file > $tmp
+    diff -u $file $tmp || ok=no
+    rm $tmp
  done
+  if [ $ok == no ]
+  then
+    false
+  fi
 fi