diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-09 21:09:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-09 21:09:59 +0300 |
| commit | 16cfd85bcf0046ae97d7ea84dae7eea3eafafe99 (patch) | |
| tree | 7e947b5817f5f4e8eab00e4169cb5431c78754ce /scripts/lint-doc.sh | |
| parent | 6c5f3e7b4eaf92ccdd8f2e5b6204683441e207ec (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/lint-doc.sh')
| -rwxr-xr-x | scripts/lint-doc.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lint-doc.sh b/scripts/lint-doc.sh index 061af911839..17c8cdaabec 100755 --- a/scripts/lint-doc.sh +++ b/scripts/lint-doc.sh @@ -92,12 +92,12 @@ then echo "Merge request pipeline (detached) detected. Testing all files." else MERGE_BASE=$(git merge-base ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA} ${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}) - if git diff --name-only "${MERGE_BASE}..${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" | grep -E "\.vale|\.markdownlint|lint-doc\.sh" + if git diff --diff-filter=d --name-only "${MERGE_BASE}..${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" | grep -E "\.vale|\.markdownlint|lint-doc\.sh" then MD_DOC_PATH=${MD_DOC_PATH:-doc} echo "Vale, Markdownlint, or lint-doc.sh configuration changed. Testing all files." else - MD_DOC_PATH=$(git diff --name-only "${MERGE_BASE}..${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" 'doc/*.md') + MD_DOC_PATH=$(git diff --diff-filter=d --name-only "${MERGE_BASE}..${CI_MERGE_REQUEST_SOURCE_BRANCH_SHA}" -- 'doc/*.md') if [ -n "${MD_DOC_PATH}" ] then echo -e "Merged results pipeline detected. Testing only the following files:\n${MD_DOC_PATH}" |