From 48639aa8fc3f63ecf01341acc4ac5d6ca7070364 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 17 Jan 2023 14:23:59 -0500 Subject: clang-format.bash: Use generic clang-format attribute Specify the clang-format version in the attribute value instead of its name. Issue: #24315 --- Utilities/Scripts/clang-format.bash | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'Utilities/Scripts') diff --git a/Utilities/Scripts/clang-format.bash b/Utilities/Scripts/clang-format.bash index 7ca4433a81..9b38a5b6c8 100755 --- a/Utilities/Scripts/clang-format.bash +++ b/Utilities/Scripts/clang-format.bash @@ -40,7 +40,7 @@ Example to format files modified by the most recent commit: Utilities/Scripts/clang-format.bash --amend -Example to format all files: +Example to format all files tracked by Git: Utilities/Scripts/clang-format.bash --tracked @@ -115,10 +115,8 @@ esac $git_ls | # Select sources with our attribute. - git check-attr --stdin format.clang-format-6.0 | - grep -e ': format\.clang-format-6\.0: set$' | - sed -n 's/:[^:]*:[^:]*$//p' | + git check-attr --stdin format.clang-format | + sed -n '/: format\.clang-format: \(set\|6\.0\)$/ {s/:[^:]*:[^:]*$//p}' | # Update sources in-place. - tr '\n' '\0' | - xargs -0 "$clang_format" -i + xargs -d '\n' "$clang_format" -i -- cgit v1.2.1