From a0b5912853eec63bf19844e3a8b4d76f246cb84a Mon Sep 17 00:00:00 2001 From: K Jonathan Harker Date: Wed, 9 Jul 2014 14:30:16 -0700 Subject: [PATCH] Update git refs before comparing refs The current check will work since an known tag is already at the right ref and an unknown tag will give an unequal value from git rev-list. But this fails to work if the version is, for example, 'origin/master' rather than a git tag. Change-Id: I746624649acaa7fab217b8ff5570f5822003b2f3 --- install_modules.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install_modules.sh b/install_modules.sh index 8bd527de0b..44c63a79dd 100755 --- a/install_modules.sh +++ b/install_modules.sh @@ -106,10 +106,10 @@ for MOD in ${!SOURCE_MODULES[*]} ; do git clone $MOD "${MODULE_PATH}/${MODULE_NAME}" fi fi + # fetch the latest refs from the repo + $GIT_CMD_BASE fetch # make sure the correct revision is installed, I have to use rev-list b/c rev-parse does not work with tags if [ `${GIT_CMD_BASE} rev-list HEAD --max-count 1` != `${GIT_CMD_BASE} rev-list ${SOURCE_MODULES[$MOD]} --max-count 1` ]; then - # fetch the latest refs from the repo - $GIT_CMD_BASE fetch # checkout correct revision $GIT_CMD_BASE checkout ${SOURCE_MODULES[$MOD]} fi