From bee53b4e3b655d25df5355431afa37792f28ad41 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Tue, 20 Apr 2021 16:10:50 +0200
Subject: [PATCH] Hopefully git_subs() now correctly pulls the latest from the
 master branch

---
 build.sh                 | 1 +
 util/upload-distfiles.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index 1e9a514..069c67f 100755
--- a/build.sh
+++ b/build.sh
@@ -281,6 +281,7 @@ mach_env() {
 git_subs() {
     echo "git_subs: begin."
     git submodule update --recursive
+    git submodule foreach git pull origin master
     git submodule foreach git merge origin master
     echo "git_subs: done."
 }
diff --git a/util/upload-distfiles.sh b/util/upload-distfiles.sh
index 021c39f..5012055 100644
--- a/util/upload-distfiles.sh
+++ b/util/upload-distfiles.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-pkgver=87.0
+pkgver=88.0
 private_token=$1
 if [ -z $private_token ]; then
     echo "Please specify the Gitlab PRIVATE TOKEN on the commandline."