[tor-commits] [tor/master] Fix pre-commit hook to correctly allow empty changes files.

[dgoulet@xxxxxxxxxxxxxx]

commit 98e08b452f81316f108113d7ecff15a5e2855d63
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Apr 10 11:49:23 2019 -0400

    Fix pre-commit hook to correctly allow empty changes files.
    
    Fixes bug 30120; bugfix not in any released Tor.
---
 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
index 65fa99f4c..4a962851b 100755
--- 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] \



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits