From e22bf529c1022af149d93ded005e04880b28fffb Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 4 Jan 2019 06:03:38 +0100
Subject: [PATCH] release.sh: fix exclusion pattern [ci skip]

grep support of "\s" pattern is unreliable.
---
 scripts/git-log-pretty-since.sh | 2 +-
 scripts/release.sh              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/git-log-pretty-since.sh b/scripts/git-log-pretty-since.sh
index 6281127542..529349d632 100755
--- a/scripts/git-log-pretty-since.sh
+++ b/scripts/git-log-pretty-since.sh
@@ -22,7 +22,7 @@ is_merge_commit() {
 for commit in $(git log --format='%H' --first-parent "$__SINCE"..HEAD); do
   if is_merge_commit ${commit} ; then
       if [ -z "$__INVMATCH" ] || ! git log --oneline ${commit}^1..${commit}^2 \
-           | grep -E "$__INVMATCH" >/dev/null 2>&1 ; then
+           | >/dev/null 2>&1 grep -E "$__INVMATCH" ; then
         git log -1 --oneline ${commit}
         git log --format='    %h %s' ${commit}^1..${commit}^2
       fi
diff --git a/scripts/release.sh b/scripts/release.sh
index 66ffd3e6fe..1645a10452 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -67,7 +67,7 @@ _do_release_commit() {
 
   if ! test "$ARG1" = '--use-current-commit' ; then
     echo "Building changelog since ${__LAST_TAG}..."
-    __CHANGELOG="$(./scripts/git-log-pretty-since.sh "$__LAST_TAG" 'vim-patch:\S')"
+    __CHANGELOG="$(./scripts/git-log-pretty-since.sh "$__LAST_TAG" 'vim-patch:[^[:space:]]')"
 
     git add CMakeLists.txt
     git commit --edit -m "${__RELEASE_MSG} ${__CHANGELOG}"