From 5bd2f558bfb6737762b2f59c32ccd989bcedd199 Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Mon, 15 Feb 2016 10:18:34 -0500 Subject: [PATCH] Prevents 'make prod' from failing when auto-generated files do not change. --- UI/WebServerResources/GNUmakefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/UI/WebServerResources/GNUmakefile b/UI/WebServerResources/GNUmakefile index 6bd7e3bae..748a48763 100644 --- a/UI/WebServerResources/GNUmakefile +++ b/UI/WebServerResources/GNUmakefile @@ -26,7 +26,11 @@ prod: grunt --stack build git update-index --no-assume-unchanged $(CSS_FILES) $(JS_FILES) $(JS_LIB_FILES) git add -f $(CSS_FILES) $(JS_FILES) $(JS_LIB_FILES) - git commit -m "(js/css) Update generated files" + @if ! git diff --quiet --exit-code; then \ + git commit -m "(js/css) Update generated files"; \ + else \ + echo "Nothing to commit; skipping git-commit"; \ + fi git update-index --assume-unchanged $(CSS_FILES) $(JS_FILES) $(JS_LIB_FILES) all: