aboutsummaryrefslogtreecommitdiffstats
path: root/tools/pre-commit
diff options
context:
space:
mode:
authorJoerg Mayer <jmayer@loplof.de>2016-03-23 20:55:08 +0100
committerJörg Mayer <jmayer@loplof.de>2016-03-23 19:58:51 +0000
commite8472e5660833e261938c63c0ccf9e25138c7832 (patch)
tree1b62e5b83d83e91a99588040f8b10730f4877696 /tools/pre-commit
parentaacab13591875f6ab6db6555517eb787f02f6cbc (diff)
Fix a problem that prevented checkins of all filenames containing the
character 'r' on MacOS with an active pre-commit hook. Change-Id: If26fb22d5057794ec0de0def4055310b78a05f89 Reviewed-on: https://code.wireshark.org/review/14600 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'tools/pre-commit')
-rwxr-xr-xtools/pre-commit4
1 files changed, 3 insertions, 1 deletions
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