From e7ecd9aac8260874c3c7af0a5335b22282eba207 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Thu, 12 Jan 2017 17:53:32 +0100
Subject: fix git updating logic

---
 taler-build/update_libgnurl.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'taler-build/update_libgnurl.sh')

diff --git a/taler-build/update_libgnurl.sh b/taler-build/update_libgnurl.sh
index 356a6eb..a86ddcb 100755
--- 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
-- 
cgit v1.2.3