From 0e20514b2f0cc93f1cdce4316277d2d7f0e8242f Mon Sep 17 00:00:00 2001 From: Sam Salisbury Date: Wed, 17 Feb 2021 13:37:39 +0000 Subject: [PATCH] fix 'make update-ui-version' (#933) - When using a branch name rather than a commit, the branch was not being updated to the latest version. --- scripts/uiclone.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/uiclone.sh b/scripts/uiclone.sh index 63b878c3a3..163794044e 100755 --- a/scripts/uiclone.sh +++ b/scripts/uiclone.sh @@ -27,3 +27,5 @@ cd "${UI_CLONE_DIR}" git reset --hard git fetch origin "${UI_COMMITISH}" git checkout "${UI_COMMITISH}" +git pull --ff-only origin "${UI_COMMITISH}" +git reset --hard "${UI_COMMITISH}"