From 9273e138c352ee899291d3384d58f1edbb19a15b Mon Sep 17 00:00:00 2001 From: Sorin Sbarnea Date: Thu, 18 Apr 2013 15:37:36 +0100 Subject: [PATCH] Logging changes to log errors properly. modified: release.sh --- release.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/release.sh b/release.sh index cb03790..2fa4299 100755 --- a/release.sh +++ b/release.sh @@ -16,7 +16,7 @@ git pull -u python setup.py check --restructuredtext --strict -autopep8 -i *.py +autopep8 -i -r src/*.py # commented some errors temporarly, TODO: remove them and fix the code pep8 --max-line-length=180 --ignore=E502,E128,E123,E127,E125 src @@ -24,15 +24,16 @@ pep8 --max-line-length=180 --ignore=E502,E128,E123,E127,E125 src # Disallow unstaged changes in the working tree if ! git diff-files --quiet --ignore-submodules -- then - echo >&2 "cannot $1: you have unstaged changes." - git diff-files --name-status -r --ignore-submodules -- >&2 + echo >&2 "error: you have unstaged changes." + git diff + git diff-files --color=auto --ignore-submodules -- >&2 exit 1 fi # Disallow uncommitted changes in the index if ! git diff-index --cached --quiet HEAD --ignore-submodules -- then - echo >&2 "cannot $1: your index contains uncommitted changes." + echo >&2 "error: your index contains uncommitted changes." git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2 exit 1 fi