From dc18ffddc1b94902315dc987fdbea0d82145163b Mon Sep 17 00:00:00 2001
From: Eric Zillmann <zillmann@arocom.de>
Date: Fri, 16 Oct 2020 10:22:45 +0200
Subject: [PATCH] #22 changed method of branch state check to use grep instead
of wildcard matching to make sure the match is exact
---
templates/scripts/update/update.jinja2 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/templates/scripts/update/update.jinja2 b/templates/scripts/update/update.jinja2
index 63b6015..7d37d57 100644
--- a/templates/scripts/update/update.jinja2
+++ b/templates/scripts/update/update.jinja2
@@ -15,8 +15,7 @@ branch="$(git rev-parse --abbrev-ref HEAD)"
if [ $force -eq 0 ]; then
echo '> check for changes'
- OUTPUT=$(git remote show origin)
- if [[ $OUTPUT == *"$branch "*"pushes to $branch "*"(up to date)"* ]]; then
+ if git remote show origin | grep "^ *$branch *pushes to $branch *(up to date)" >/dev/null; then
echo "> unchanged, cancel"
exit
fi
--
GitLab