From a6cc52144b7d9074abc01630ba5754b3f00f2792 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@edx.org>
Date: Mon, 18 Oct 2021 16:21:32 -0400
Subject: [PATCH] test: don't run xss-commit-linter unless we have a target
 branch

---
 scripts/generic-ci-tests.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/generic-ci-tests.sh b/scripts/generic-ci-tests.sh
index a879a359bf..c444c850a9 100755
--- a/scripts/generic-ci-tests.sh
+++ b/scripts/generic-ci-tests.sh
@@ -134,8 +134,12 @@ case "$TEST_SUITE" in
                 run_paver_quality run_stylelint -l $STYLELINT_THRESHOLD || { EXIT=1; }
                 echo "Running xss linter report."
                 run_paver_quality run_xsslint -t $XSSLINT_THRESHOLDS || { EXIT=1; }
-                echo "Running safe commit linter report."
-                run_paver_quality run_xsscommitlint || { EXIT=1; }
+                if [[ ! -z "$TARGET_BRANCH" ]]; then
+                    echo "Running safe commit linter report."
+                    run_paver_quality run_xsscommitlint || { EXIT=1; }
+                else
+                    echo "Skipping safe commit linter report."
+                fi
                 echo "Running PII checker on all Django models..."
                 run_paver_quality run_pii_check || { EXIT=1; }
                 echo "Running reserved keyword checker on all Django models..."