[taler-exchange] branch master updated: do not upgrade gana to master on bootstrap (see #6839)

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 3251ca08 do not upgrade gana to master on bootstrap (see #6839)
3251ca08 is described below

commit 3251ca082abdcc16061ad1976eb1830ade3a40c5
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Apr 9 16:36:35 2021 +0200

    do not upgrade gana to master on bootstrap (see #6839)
---
 bootstrap       | 6 ++----
 contrib/gana.sh | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bootstrap b/bootstrap
index 4a11e864..90cb5133 100755
--- a/bootstrap
+++ b/bootstrap
@@ -8,13 +8,11 @@ if ! git --version >/dev/null; then
 fi
 
 
-git submodule update --init
+echo "$0: Updating submodules"
+echo | git submodule update --init
 
 ./contrib/gana-update.sh
 
-
-./contrib/gana.sh
-
 # This is more portable than `which' but comes with
 # the caveat of not(?) properly working on busybox's ash:
 existence()
diff --git a/contrib/gana.sh b/contrib/gana.sh
index 0475d7ff..30dc7994 100755
--- a/contrib/gana.sh
+++ b/contrib/gana.sh
@@ -6,3 +6,5 @@ set -eu
 cd contrib/gana
 git pull origin master
 cd ../..
+
+exec ./contrib/gana-update.sh

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.