diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-06 12:57:09 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-06 12:57:09 +0000 |
| commit | da5c37256bf73cb4fbac44d96a27bad7321bdccc (patch) | |
| tree | e44d8a5f7cc455a921214f08665219ada04e65eb | |
| parent | e27fa5bc14382abb4383ad5df2867f23bf9f1092 (diff) | |
| parent | d6c2f5f5699495260aa2a99ea09a1764e9ec5e9c (diff) | |
| download | gitlab-ce-da5c37256bf73cb4fbac44d96a27bad7321bdccc.tar.gz | |
Merge branch 'rs-extended-regexp' into 'master'
Use `--extended-regexp` in lint-doc for compatibility with Darwin grep
Now it should work on all platforms.
See merge request !7943
| -rwxr-xr-x | scripts/lint-doc.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lint-doc.sh b/scripts/lint-doc.sh index 7c4e8276902..62236ed539a 100755 --- a/scripts/lint-doc.sh +++ b/scripts/lint-doc.sh @@ -3,7 +3,7 @@ cd "$(dirname "$0")/.." # Use long options (e.g. --header instead of -H) for curl examples in documentation. -grep --perl-regexp --recursive --color=auto 'curl (.+ )?-[^- ].*' doc/ +grep --extended-regexp --recursive --color=auto 'curl (.+ )?-[^- ].*' doc/ if [ $? == 0 ] then echo '✖ ERROR: Short options should not be used in documentation!' >&2 |