Merge pull request #47331 from wasylkowski/fix-gofmt

Automatic merge from submit-queue Fixed the issue with formatting issues not being reported when verification fails **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #47331 from wasylkowski/fix-gofmt
e626d381 · Kubernetes Submit Queue · GitHub · 5e8f44f1 · 9920fea5 · e626d381
Commit e626d381 authored Jun 20, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

verify-gofmt.sh hack/verify-gofmt.sh +5 -1

No files found.
--- a/hack/verify-gofmt.sh
+++ b/hack/verify-gofmt.sh
@@ -48,7 +48,11 @@ find_files() {
    \) -name '*.go'
 }
-diff=$(find_files | xargs ${gofmt} -d -s 2>&1)
+# gofmt exits with non-zero exit code if it finds a problem unrelated to
+# formatting (e.g., a file does not parse correctly). Without "|| true" this
+# would have led to no useful error message from gofmt, because the script would
+# have failed before getting to the "echo" in the block below.
+diff=$(find_files | xargs ${gofmt} -d -s 2>&1) || true
 if [[ -n "${diff}" ]]; then
  echo "${diff}"
  exit 1