From 27cbcb6a2a5e6df5ac187ef195a78974932d5b44 Mon Sep 17 00:00:00 2001
From: Christoffer <christoffer@netravnen.de>
Date: Fri, 4 Jan 2019 11:18:41 +0000
Subject: [PATCH] Update update.sh

---
 update.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/update.sh b/update.sh
index ffd6bce..826f41b 100755
--- a/update.sh
+++ b/update.sh
@@ -8,6 +8,18 @@ git -C ../registry/ pull upstream master:master --quiet 2>&1
 # Checkout master branch in dn42/repository
 git -C ../registry/ checkout master --quiet
 
+# Do a git pull beforehand to ensure our repository is up-to-date
+git checkout master
+git pull origin master:master
+
+# Do the same for sub-repo if exists
+if [ -d roa/.git/ ] ; then
+  git -C roa/ checkout master --quiet
+  if [ $(git -C roa/ remote | grep origin) ] ; then
+    git -C roa/ pull origin master:master --quiet
+  fi
+fi
+
 # Update with data from registry
 php roagen.php
 php rfc8416.php