From 1d868ff73c66b3d9c687b42769f0bf300168a25c Mon Sep 17 00:00:00 2001 From: Patrice Levesque Date: Thu, 4 Feb 2016 15:03:41 -0500 Subject: [PATCH] Remove 'git stash' commands from 'prod' recipe: it caused odd side-effects on pristine local repositories --- UI/WebServerResources/GNUmakefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/UI/WebServerResources/GNUmakefile b/UI/WebServerResources/GNUmakefile index 4691416b4..1118912d7 100644 --- a/UI/WebServerResources/GNUmakefile +++ b/UI/WebServerResources/GNUmakefile @@ -23,13 +23,11 @@ dev: grunt --stack build prod: - git stash 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" git update-index --assume-unchanged $(CSS_FILES) $(JS_FILES) $(JS_LIB_FILES) - git stash pop all: @echo "The 'all' target does nothing. Use 'make dev' to generate static files and 'make install' to install them."