diff options
| author | Florian Dold <florian.dold@gmail.com> | 2017-01-12 17:53:32 +0100 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2017-01-12 17:53:32 +0100 |
| commit | e7ecd9aac8260874c3c7af0a5335b22282eba207 (patch) | |
| tree | 86408ade2cc09705e8b683c705adc411774620a0 /taler-build/update_libgnurl.sh | |
| parent | 76e808a481452b84f9b71daf0e9123e1fa9394cb (diff) | |
| download | deployment-e7ecd9aac8260874c3c7af0a5335b22282eba207.tar.gz deployment-e7ecd9aac8260874c3c7af0a5335b22282eba207.tar.bz2 deployment-e7ecd9aac8260874c3c7af0a5335b22282eba207.zip | |
fix git updating logic
Diffstat (limited to 'taler-build/update_libgnurl.sh')
| -rwxr-xr-x | taler-build/update_libgnurl.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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 |