From 206b03aeae3a368983ac3d6ad5e5828030bbaacd Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 10 Nov 2020 18:09:07 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 scripts/lint-doc.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'scripts/lint-doc.sh')

diff --git a/scripts/lint-doc.sh b/scripts/lint-doc.sh
index 1b671df84e6..63c5b80ffff 100755
--- a/scripts/lint-doc.sh
+++ b/scripts/lint-doc.sh
@@ -66,8 +66,11 @@ then
 else
   MERGE_BASE=$(git merge-base ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA} ${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA})
   MD_DOC_PATH=$(git diff --name-only "${MERGE_BASE}..${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" 'doc/*.md')
-  echo -e "Merged results pipeline detected. Testing only the following files:\n${MD_DOC_PATH}"
- fi
+  if [ -n "${MD_DOC_PATH}" ]
+  then
+    echo -e "Merged results pipeline detected. Testing only the following files:\n${MD_DOC_PATH}"
+  fi
+fi
 
 function run_locally_or_in_docker() {
   local cmd=$1
@@ -98,7 +101,12 @@ function run_locally_or_in_docker() {
 
 echo '=> Linting markdown style...'
 echo
-run_locally_or_in_docker 'markdownlint' "--config .markdownlint.json ${MD_DOC_PATH}"
+if [ -z "${MD_DOC_PATH}" ]
+then
+  echo "Merged results pipeline detected, but no markdown files found. Skipping."
+else
+  run_locally_or_in_docker 'markdownlint' "--config .markdownlint.json ${MD_DOC_PATH}"
+fi
 
 echo '=> Linting prose...'
 run_locally_or_in_docker 'vale' "--minAlertLevel error --output=JSON ${MD_DOC_PATH}" "ruby scripts/vale.rb"
-- 
cgit v1.2.3