From 2cb460d7d73eb6d41ae3c953356f343962636bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Sat, 11 Nov 2023 16:29:44 +0100 Subject: [PATCH] common/scripts/lint-conflicts: fix full repo check adjust for `xlocate: output aligned, don't show "git grep" column` --- common/scripts/lint-conflicts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts index 8c7abfd9244..d98cf3b0a01 100755 --- a/common/scripts/lint-conflicts +++ b/common/scripts/lint-conflicts @@ -109,7 +109,7 @@ list_interesting_files() { if partial_check; then list_newly_built_files else - xlocate / | sed s'/ -> .*//' | grep -F -f <(xlocate / | cut -f 2- | sed s'/ -> .*//' | sort | uniq -d) + xlocate / | sed s'/ -> .*//' | grep -F -f <(xlocate / | sed 's/[^[:space:]]*[[:space:]]*//' | sed s'/ -> .*//' | sort | uniq -d) fi }