Merge pull request #157 from dnephin/make-compose-check-fail

Fix check-git-diff in CI

circle.yml

@@ -47,6 +47,7 @@ jobs:
             if [ "$CIRCLE_NODE_INDEX" != "3" ]; then exit; fi
             dockerfile=dockerfiles/Dockerfile.dev
             echo "COPY . ." >> $dockerfile
+            rm -f .dockerignore # include .git
             docker build -f $dockerfile --tag cli-builder .
             docker run cli-builder make -B vendor compose-jsonschema
 

scripts/validate/check-git-diff

@@ -3,12 +3,13 @@
 set -eu
 
 DIFF_PATH=$1
+DIFF=$(git status --porcelain -- $DIFF_PATH)
 
-if [ "`git status --porcelain -- $DIFF_PATH 2>/dev/null`" ]; then
+if [ "$DIFF" ]; then
     echo
     echo "These files were changed:"
     echo
-    git status --porcelain -- $DIFF_PATH 2>/dev/null
+    echo $DIFF
     echo
     exit 1
 else