summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2016-11-22 14:33:56 +0100
committerFlorian Dold <florian.dold@gmail.com>2016-11-22 14:33:56 +0100
commitbb0d2176c28805d4bc8e56c9823bbdfeab194239 (patch)
tree4108f60c4351265396264d505d2a3bfa4739e4b3
parent2852f4964ef6199f67148120f78960f883e62633 (diff)
downloaddeployment-bb0d2176c28805d4bc8e56c9823bbdfeab194239.tar.gz
deployment-bb0d2176c28805d4bc8e56c9823bbdfeab194239.tar.bz2
deployment-bb0d2176c28805d4bc8e56c9823bbdfeab194239.zip
force submodule update
-rwxr-xr-xtaler-build/update_landing.sh2
-rwxr-xr-xtaler-build/update_merchant.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/taler-build/update_landing.sh b/taler-build/update_landing.sh
index eedb154..39f60e4 100755
--- a/taler-build/update_landing.sh
+++ b/taler-build/update_landing.sh
@@ -10,7 +10,7 @@ git clean -fxd
git fetch
git reset --hard FETCH_HEAD
-git submodule update --init
+git submodule update --force --init
AUTOMAKE="automake --foreign" autoreconf -fiv
./configure
make
diff --git a/taler-build/update_merchant.sh b/taler-build/update_merchant.sh
index ad5832c..c66b2ba 100755
--- a/taler-build/update_merchant.sh
+++ b/taler-build/update_merchant.sh
@@ -10,7 +10,7 @@ git clean -fdx
git fetch
git reset --hard FETCH_HEAD
-git submodule update --init
+git submodule update --init --force
./bootstrap
./configure CFLAGS='-ggdb -O0' \