diff --git a/Tools/astyle/files_to_check_code_style.sh b/Tools/astyle/files_to_check_code_style.sh
index 9098b500e9..8d1e38f491 100755
--- a/Tools/astyle/files_to_check_code_style.sh
+++ b/Tools/astyle/files_to_check_code_style.sh
@@ -1,12 +1,6 @@
 #!/usr/bin/env bash
 set -eu
 
-PATTERN="-e ."
-
-if [ $# -gt 0 ]; then
-    PATTERN="$1"
-fi
-
 exec find boards msg src platforms test \
     -path msg/templates/urtps -prune -o \
     -path platforms/nuttx/NuttX -prune -o \
@@ -27,4 +21,4 @@ exec find boards msg src platforms test \
     -path src/lib/crypto/monocypher -prune -o \
     -path src/lib/crypto/libtomcrypt -prune -o \
     -path src/lib/crypto/libtommath -prune -o \
-    -type f \( -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" \) | grep $PATTERN
+    -type f \( -name "*.c" -o -name "*.h" -o -name "*.cpp" -o -name "*.hpp" \)
diff --git a/Tools/astyle/pre-commit b/Tools/astyle/pre-commit
index a07c820d26..6c9bb248e6 100755
--- a/Tools/astyle/pre-commit
+++ b/Tools/astyle/pre-commit
@@ -54,12 +54,9 @@ if [ $? -ne 0 ]; then
 fi
 
 # Check for code style, only in changed files
-for i in `git diff --cached --name-only --diff-filter=ACM`
-do
-	./Tools/astyle/files_to_check_code_style.sh $i | xargs -n 1 -P 8 -I % ./Tools/astyle/check_code_style.sh %
-	if [ $? -ne 0 ]
-	then
-		echo "Pre-commit style error: Bad formatting according to astyle rules"
-		exit 1
-	fi
-done
+bash -c "comm -12 <(./Tools/astyle/files_to_check_code_style.sh | sort) <(git diff --cached --name-only --diff-filter=ACM) | xargs -P 8 -I % ./Tools/astyle/check_code_style.sh %"
+if [ $? -ne 0 ]
+then
+	echo "Pre-commit style error: Bad formatting according to astyle rules"
+	exit 1
+fi