From e8472e5660833e261938c63c0ccf9e25138c7832 Mon Sep 17 00:00:00 2001 From: Joerg Mayer Date: Wed, 23 Mar 2016 20:55:08 +0100 Subject: Fix a problem that prevented checkins of all filenames containing the character 'r' on MacOS with an active pre-commit hook. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If26fb22d5057794ec0de0def4055310b78a05f89 Reviewed-on: https://code.wireshark.org/review/14600 Reviewed-by: Jörg Mayer --- tools/pre-commit | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/pre-commit b/tools/pre-commit index c2ca5cd7c5..ae4e2f0371 100755 --- a/tools/pre-commit +++ b/tools/pre-commit @@ -64,7 +64,9 @@ if [ $? -ne 0 ]; then fi # On windows python will output \r\n line endings - we don't want that -CHECK_FILES=`echo "$CHECK_FILES" | sed 's/\r//g'` +# On MacOS the line below will remove all 'r' characters from the filenames +# - we want this even less. +#CHECK_FILES=`echo "$CHECK_FILES" | sed 's/\r//g'` for FILE in $CHECK_FILES; do -- cgit v1.2.1