diff options
Diffstat (limited to 'git-hooks')
| -rwxr-xr-x | git-hooks/post-merge | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-hooks/post-merge b/git-hooks/post-merge index f80a03834..9618b5e31 100755 --- a/git-hooks/post-merge +++ b/git-hooks/post-merge @@ -19,5 +19,9 @@ if echo "$changes" | grep data/js/ > /dev/null; then scripts/optimize_js.sh fi +if [[ ! -f ./data/js/main.min.js ]]; then + scripts/optimize_js.sh +fi + # Show changes to NEWS git diff @{1} NEWS | cat |