Merge pull request #1801 from spiffxp/diff-output-is-ok

lib_util: diff_colorized always exits 0
kubernetes · Mar 17, 2021 · be4ead4 · be4ead4
2 parents ed4e5eb + 344dd4b
commit be4ead4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/infra/gcp/lib_util.sh b/infra/gcp/lib_util.sh
@@ -110,5 +110,5 @@ function join_by() {
 
 # use git-diff for color output, strip patch header
 function diff_colorized() {
-  git --no-pager diff --color --no-prefix --no-index "$@" | tail -n+5
+  (git --no-pager diff --color --no-prefix --no-index "$@" | tail -n+5) || true
 }