diff options
Diffstat (limited to 'taler-build/update_deployment.sh')
| -rwxr-xr-x | taler-build/update_deployment.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/taler-build/update_deployment.sh b/taler-build/update_deployment.sh index c3aa3c5..c3ebe4a 100755 --- 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" + |