diff options
| author | Julian Andres Klode <jak@debian.org> | 2024-02-20 08:30:16 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2024-02-20 08:30:16 +0000 |
| commit | c1aac9f3879f8d4f0f0d5bccd33d362ca5b75615 (patch) | |
| tree | a44b3ef1892b52c18075e67f6aab84fdfcab6323 | |
| parent | dfa7965f2f82ba5ada3ed4feea4630a7d4cc5895 (diff) | |
| parent | f5e3002b84a437fa9dcb5d15d29d53181a0344d5 (diff) | |
Merge branch 'testing-clang' into 'main'
Fix bug where ./git-clang-format.sh errors incorrectly
See merge request apt-team/apt!325
| -rwxr-xr-x | git-clang-format.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/git-clang-format.sh b/git-clang-format.sh index 6348652c1..da6e6d8c2 100755 --- a/git-clang-format.sh +++ b/git-clang-format.sh @@ -7,4 +7,6 @@ if [ -z "$CLANG_FORMAT" ]; then fi git "$(basename "$CLANG_FORMAT" | cut -d'-' -f 2-)" --diff "$@" | \ sed "s#+/\*\}\}\}\*/#+ /*}}}*/#" | \ + grep -v '^clang-format did not modify any files$' | \ + grep -v '^no modified files to format$' | \ patch -p1 |