From 795ec46c817c94c9072e907c4d3d707aae7cb3ba Mon Sep 17 00:00:00 2001 From: InverseBot Date: Thu, 25 Feb 2016 10:20:26 -0500 Subject: [PATCH] git-diff check happens post-git-add; the check needs to happen vs. the staged files, if not, git-diff will always be empty --- UI/WebServerResources/GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/WebServerResources/GNUmakefile b/UI/WebServerResources/GNUmakefile index 748a48763..a557ddb89 100644 --- a/UI/WebServerResources/GNUmakefile +++ b/UI/WebServerResources/GNUmakefile @@ -26,7 +26,7 @@ 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) - @if ! git diff --quiet --exit-code; then \ + @if ! git diff --cached --quiet --exit-code; then \ git commit -m "(js/css) Update generated files"; \ else \ echo "Nothing to commit; skipping git-commit"; \