Only run trivy check in git hook if we have anything to push

rupor-github · Mar 13, 2023 · ecb2d86 · ecb2d86
1 parent 8b311df
commit ecb2d86
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/cmake/pre-push b/cmake/pre-push
@@ -18,6 +18,11 @@ if [[ $? != 0 ]]; then
   exit 1
 fi
 
-# without the --exit-code 1 flag - trivy always exists with 0
 cd @PROJECT_SOURCE_DIR@
+# Check if we actually have commits to push
+commits=`git log @{u}..`
+if [ -z "$commits" ]; then
+    exit 0
+fi
+# without the --exit-code 1 flag - trivy always exists with 0
 ${scanner} --exit-code 1 fs --ignore-unfixed .