From aebab49285849a62d084e08c6de49c4937352aac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Wed, 5 Apr 2023 20:34:21 +0200
Subject: [PATCH] Speed up validate-git-marks by about a factor of three
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
---
hack/validate-git-marks.sh | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/hack/validate-git-marks.sh b/hack/validate-git-marks.sh
index 0ba98f45..57943942 100755
--- a/hack/validate-git-marks.sh
+++ b/hack/validate-git-marks.sh
@@ -6,17 +6,7 @@ unset IFS
badFiles=()
for f in "${files[@]}"; do
- if [ $(grep -r "^<<<<<<<" $f) ]; then
- badFiles+=( "$f" )
- continue
- fi
-
- if [ $(grep -r "^>>>>>>>" $f) ]; then
- badFiles+=( "$f" )
- continue
- fi
-
- if [ $(grep -r "^=======$" $f) ]; then
+ if [ $(grep -r "^\(<<<<<<<\|>>>>>>>\|^=======$\)" $f) ]; then
badFiles+=( "$f" )
continue
fi