From 76fe5cb4178939add86d078443a03f21b7a78229 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Tue, 19 Aug 2014 17:18:23 +0000 Subject: mason: Don't checkout repo using .git suffix Failing to do this means that the deployment uses the wrong morphology, because build will end up using the repo without the .git suffix, so it will never update the cached version of the repo without it. The version with the .git suffix is only updated on the initial checkout, but is used by deploy, so it would pick up obsolete morphologies and not include new changes. Rubber-stamped-by: Richard Maw --- mason/mason.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mason') diff --git a/mason/mason.sh b/mason/mason.sh index 240cc347..13b97b7e 100755 --- a/mason/mason.sh +++ b/mason/mason.sh @@ -13,7 +13,7 @@ cd ws definitions_repo="$DEFINITIONS_REF"/"$DISTBUILD_TROVE_ADDRESS"/baserock/baserock/definitions if [ ! -e "$definitions_repo" ]; then - morph checkout git://"$DISTBUILD_TROVE_ADDRESS"/baserock/baserock/definitions.git "$DEFINITIONS_REF" + morph checkout git://"$DISTBUILD_TROVE_ADDRESS"/baserock/baserock/definitions "$DEFINITIONS_REF" cd "$definitions_repo" git config user.name "$TROVE_ID"-mason git config user.email "$TROVE_ID"-mason@$(hostname) -- cgit v1.2.1