diff --git a/scripts/chkgitstatus.sh b/scripts/chkgitstatus.sh
index 8ee92a528ec..4cacde7a452 100755
--- a/scripts/chkgitstatus.sh
+++ b/scripts/chkgitstatus.sh
@@ -7,7 +7,13 @@ command -v git > /dev/null || {
   exit 2 # considered a "skip"
 }
 
-git -C ${srcdir} status -uno > .gitstatus-full || exit 1
+if test "${QGIS_TEST_ACCEPT_GITSTATUS_CHECK_FAILURE}" = "1"; then
+	exit=2
+else
+	exit=1
+fi
+
+git -C ${srcdir} status -uno > .gitstatus-full || exit $exit
 
 if test "$1" = "log"; then
   grep 'modified: ' .gitstatus-full | sort -u > .gitstatus
@@ -18,10 +24,7 @@ elif test "$1" = "check"; then
   else
     echo "Source files (printed above) were modified. Diff follows:"
     git -C ${srcdir} diff
-    if test "${QGIS_TEST_ACCEPT_GITSTATUS_CHECK_FAILURE}" = "1"; then
-      exit 2 # considered a "skip" by CMake
-    fi
-    exit 1
+    exit $exit
   fi
 else
   echo "Usage: $0 [log|check]" >&2