diff options
| author | Florian Dold <florian.dold@gmail.com> | 2017-01-12 17:50:02 +0100 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2017-01-12 17:50:02 +0100 |
| commit | 76e808a481452b84f9b71daf0e9123e1fa9394cb (patch) | |
| tree | b709ab3f162377339427a2484b1b836ec55a501b | |
| parent | 5dc107e8985f036a1855d64ddd4b79e336dc3956 (diff) | |
| download | deployment-76e808a481452b84f9b71daf0e9123e1fa9394cb.tar.gz deployment-76e808a481452b84f9b71daf0e9123e1fa9394cb.tar.bz2 deployment-76e808a481452b84f9b71daf0e9123e1fa9394cb.zip | |
fix git updating logic
| -rwxr-xr-x | taler-build/update_gnunet.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/taler-build/update_gnunet.sh b/taler-build/update_gnunet.sh index 04ebb57..1f9bedf 100755 --- a/taler-build/update_gnunet.sh +++ b/taler-build/update_gnunet.sh @@ -5,10 +5,10 @@ set -eu cd $HOME/gnunet/ 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 --enable-logging=verbose --with-libgnurl=$HOME/local --with-microhttpd=$HOME/local |