ignore empty and comment lines in gitallowed

alexQueue · May 4, 2016 · 45e3d87 · 45e3d87
1 parent 6e6c42f
commit 45e3d87
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/git-secrets b/git-secrets
@@ -54,10 +54,10 @@ load_patterns() {
 }
 
 load_allowed() {
-  git config --get-all secrets.allowed
+  git config --get-all secrets.allowed | awk 'NF && $1!~/^#/'
   local gitallowed="$(git rev-parse --show-toplevel)/.gitallowed"
   if [ -e "$gitallowed" ]; then
-    cat $gitallowed
+    cat $gitallowed | awk 'NF && $1!~/^#/'
   fi
 }
 

diff --git a/test/git-secrets.bats b/test/git-secrets.bats
@@ -238,6 +238,13 @@ load test_helper
   echo "$output" | grep -F 'secrets.allowed testing\+abc'
 }
 
+@test "Empty lines must be ignored in .gitallowed files" {
+  setup_bad_repo
+  echo '' >> $TEST_REPO/.gitallowed
+  repo_run git-secrets --scan
+  [ $status -eq 1 ]
+}
+
 @test "Scans all files and allowing none of the bad patterns in .gitallowed" {
   setup_bad_repo
   echo 'hello' > $TEST_REPO/.gitallowed