status-im
/
nimbus-build-system
mirror of https://github.com/status-im/nimbus-build-system.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

deal w/ a diverged local branch where a ff merge is not possible

This commit is contained in:
Ștefan Talpalaru 2021-07-30 21:34:43 +02:00
parent 0e709abc28
commit 7897dfe46c
No known key found for this signature in database
GPG Key ID: CBF7934204F1B6F9
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/build_nim.sh
View File

@ -68,6 +68,9 @@ nim_needs_rebuilding() {
git fetch --all git fetch --all
git checkout -q ${NIM_COMMIT} git checkout -q ${NIM_COMMIT}
fi fi
# In case the local branch diverged and a fast-forward merge is not possible.
git fetch || true
git reset -q --hard origin/${NIM_COMMIT} || true
# In case NIM_COMMIT is a local branch that's behind the remote one it's tracking. # In case NIM_COMMIT is a local branch that's behind the remote one it's tracking.
git pull -q 2>/dev/null || true git pull -q 2>/dev/null || true
git checkout -q ${NIM_COMMIT} git checkout -q ${NIM_COMMIT}