tor

commit 98e08b452f81316f108113d7ecff15a5e2855d63
parent 3be1e26b8d27b9baa89549fff56fadd2894ec00f
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 10 Apr 2019 11:49:23 -0400

Fix pre-commit hook to correctly allow empty changes files.

Fixes bug 30120; bugfix not in any released Tor.

Diffstat:
M
scripts/git/pre-commit.git-hook
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook
@@ -12,7 +12,7 @@ cd "$workdir" || exit 1
 
 set -e
 
-if [ ! -z "ls ./changes/*" ]; then
+if [ -n "$(ls ./changes/)" ]; then
     python scripts/maint/lintChanges.py ./changes/*
 fi
 
@@ -26,7 +26,7 @@ if [ -d src/lib ]; then
          src/test/*.[ch] \
          src/test/*/*.[ch] \
          src/tools/*.[ch]
-elif [ -d src/common]; then
+elif [ -d src/common ]; then
     # This was the layout before 0.3.5
     perl scripts/maint/checkSpace.pl -C \
          src/common/*/*.[ch] \