diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-08-18 08:47:49 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2016-08-18 11:00:27 +0000 |
| commit | 0a609d419527b3f0cd15b2a66f9be5df3718c3a8 (patch) | |
| tree | eebe6cf7e73771b95c8cee79562b5aa49f685ca6 /tools/pre-commit | |
| parent | b366d6e4dd5f14cfea820d132ee16b45b18bd869 (diff) | |
pre-commit: Ignore missing pre-commit-ignore.py
Print error message to stderr and return non-zero exit status from
child process.
Change-Id: Icd433d79c5a7bf8b6ddd8e94e26695b353e34d1f
Reviewed-on: https://code.wireshark.org/review/17116
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: João Valverde <j@v6e.pt>
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'tools/pre-commit')
| -rwxr-xr-x | tools/pre-commit | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/tools/pre-commit b/tools/pre-commit index 35895a4cf1..b5a7d8eab4 100755 --- a/tools/pre-commit +++ b/tools/pre-commit @@ -55,14 +55,10 @@ COMMIT_FILES=`git diff-index --cached --name-status ${COMMIT_ID} | grep -v "^D" filter_script=${PWD}/tools/pre-commit-ignore.py filter_conf=${PWD}/tools/pre-commit-ignore.conf -if [ ! -e "$filter_script" ]; then - echo "File '$filter_script' does not exist. Aborting." - exit 1 -fi - -CHECK_FILES=`echo "$COMMIT_FILES" | "$PYBIN" "$filter_script" "$filter_conf"` -if [ $? -ne 0 ]; then - exit 1 +if [ -f "$filter_script" ] && [ -f "$filter_conf" ]; then + CHECK_FILES=`echo "$COMMIT_FILES" | "$PYBIN" "$filter_script" "$filter_conf"` || exit +else + CHECK_FILES="$COMMIT_FILES" fi # On windows python will output \r\n line endings - we don't want that. |