commit e7ecd9aac8260874c3c7af0a5335b22282eba207
parent 76e808a481452b84f9b71daf0e9123e1fa9394cb
Author: Florian Dold <florian.dold@gmail.com>
Date: Thu, 12 Jan 2017 17:53:32 +0100
fix git updating logic
Diffstat:
8 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/taler-build/update_bank.sh b/taler-build/update_bank.sh
@@ -5,10 +5,10 @@ set -eu
cd $HOME/bank
git clean -fxd
-# like "git pull", but robust against force pushes
-# and local changes
git fetch
-git reset --hard FETCH_HEAD
+# reset to updated upstream branch, but only if we're tracking a branch
+branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD)
+git reset --hard "$branch"
./bootstrap
./configure --prefix="$HOME/local"
diff --git a/taler-build/update_deployment.sh b/taler-build/update_deployment.sh
@@ -10,7 +10,8 @@ set -eu
cd $HOME/deployment
git clean -fdx
-# like "git pull", but robust against force pushes
-# and local changes
git fetch
-git reset --hard FETCH_HEAD
+# reset to updated upstream branch, but only if we're tracking a branch
+branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD)
+git reset --hard "$branch"
+
diff --git a/taler-build/update_exchange.sh b/taler-build/update_exchange.sh
@@ -5,10 +5,10 @@ set -eu
cd $HOME/exchange
git clean -fdx
-# like "git pull", but robust against force pushes
-# and local changes
git fetch
-git reset --hard FETCH_HEAD
+# reset to updated upstream branch, but only if we're tracking a branch
+branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD)
+git reset --hard "$branch"
./bootstrap
if test ${1:-notgiven} = "--coverage"; then
diff --git a/taler-build/update_landing.sh b/taler-build/update_landing.sh
@@ -5,10 +5,10 @@ set -eu
cd $HOME/landing
git clean -fxd
-# like "git pull", but robust against force pushes
-# and local changes
git fetch
-git reset --hard FETCH_HEAD
+# reset to updated upstream branch, but only if we're tracking a branch
+branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD)
+git reset --hard "$branch"
git submodule update --force --init
AUTOMAKE="automake --foreign" autoreconf -fiv
diff --git a/taler-build/update_libgnurl.sh b/taler-build/update_libgnurl.sh
@@ -3,10 +3,10 @@
cd $HOME/gnurl
git clean -fxd
-# like "git pull", but robust against force pushes
-# and local changes
git fetch
-git reset --hard FETCH_HEAD
+# reset to updated upstream branch, but only if we're tracking a branch
+branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD)
+git reset --hard "$branch"
./buildconf
./configure --enable-ipv6 --with-gnutls --without-libssh2 --without-libmetalink --without-winidn --without-librtmp --without-nghttp2 --without-nss --without-cyassl --without-polarssl --without-ssl --without-winssl --without-darwinssl --disable-sspi --disable-ntlm-wb --disable-ldap --disable-rtsp --disable-dict --disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp --disable-gopher --disable-file --disable-ftp --disable-smb --prefix=$HOME/local
diff --git a/taler-build/update_libmicrohttpd.sh b/taler-build/update_libmicrohttpd.sh
@@ -3,10 +3,10 @@
cd $HOME/libmicrohttpd/
git clean -fdx
-# like "git pull", but robust against force pushes
-# and local changes
git fetch
-git reset --hard FETCH_HEAD
+# reset to updated upstream branch, but only if we're tracking a branch
+branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD)
+git reset --hard "$branch"
./bootstrap
./configure --prefix=$HOME/local
diff --git a/taler-build/update_merchant.sh b/taler-build/update_merchant.sh
@@ -7,10 +7,10 @@ set -eu
cd $HOME/merchant/
git clean -fdx
-# like "git pull", but robust against force pushes
-# and local changes
git fetch
-git reset --hard FETCH_HEAD
+# reset to updated upstream branch, but only if we're tracking a branch
+branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD)
+git reset --hard "$branch"
git submodule update --init --force
diff --git a/taler-build/update_merchant_frontends.sh b/taler-build/update_merchant_frontends.sh
@@ -5,10 +5,10 @@ set -eu
cd $HOME/merchant-frontends/
git clean -fxd
-# like "git pull", but robust against force pushes
-# and local changes
git fetch
-git reset --hard FETCH_HEAD
+# reset to updated upstream branch, but only if we're tracking a branch
+branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD)
+git reset --hard "$branch"
git submodule update --init --force
