From d07ee666e60795b12a235089e053f622e860b745 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 15 Jun 2021 14:49:49 +0200 Subject: [PATCH] devtools: fix file listing in maintainers check [ upstream commit 2d333c4ac3bf4a1d236bf24bb33fa1df58e6009b ] When having multiple working trees, the main one has a .git directory while attached trees have a .git file. Thus the git check should work for both file and directory. In the case there is no working tree (.git not readable), the command "find" is used and should be able to list paths with wildcards. Wildcards work only as shell expansion in the case of file paths, so the quotes must be removed. Fixes: 27c2ce563216 ("maintainers: start a Linux-style file") Signed-off-by: Thomas Monjalon --- devtools/check-maintainers.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devtools/check-maintainers.sh b/devtools/check-maintainers.sh index df3f740b6e..71697bb352 100755 --- a/devtools/check-maintainers.sh +++ b/devtools/check-maintainers.sh @@ -15,10 +15,10 @@ files () # [ ...] if [ -z "$1" ] ; then return fi - if [ -d .git ] ; then + if [ -r .git ] ; then git ls-files "$1" else - find "$1" -type f | + find $1 -type f | sed 's,^\./,,' fi | # if not ended by /