From 1602f3b0d0bca023a50fc2abed76d262290d4d88 Mon Sep 17 00:00:00 2001
From: Benjamin Roberts <tsujamin@users.noreply.github.com>
Date: Wed, 4 Jul 2018 23:10:30 +1000
Subject: [PATCH] Fix infinite loop when parsing update.sh arguments

update.sh would enter an infinite loop when arguments (e.g. --ours, --check). This is due to a missing `shift` statement that has now been added. This fixes #1193.
---
 update.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/update.sh b/update.sh
index e83a473f..88903ad0 100755
--- a/update.sh
+++ b/update.sh
@@ -28,6 +28,7 @@ while (($#)); do
       MERGE_STRATEGY=ours
     ;;
   esac
+  shift
 done
 
 [[ ! -f mailcow.conf ]] && { echo "mailcow.conf is missing"; exit 1;}