From 9f9b17c8705cf1829cca16cdfdb954bcb20e88c2 Mon Sep 17 00:00:00 2001 From: Daniel Donenfeld Date: Fri, 15 Feb 2019 13:10:34 -0800 Subject: [PATCH] checkout each asm branch to ensure it is available locally --- asm/scripts/deploy-asm.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1 index 32ac8f4..5fca9aa 100644 --- a/asm/scripts/deploy-asm.ps1 +++ b/asm/scripts/deploy-asm.ps1 @@ -119,6 +119,8 @@ function collectAsm { throw "Missing branch for job $($_.jobId)" } + git checkout $branchName 2>&1 + #Add origin branch to the branch list $branchName = "origin/"+$branchName $asmBranches += $branchName @@ -131,7 +133,7 @@ function collectAsm { #Merge all branches into master $branchString = $asmBranches -join ' ' - git checkout master + git checkout master 2>&1 git pull git fetch origin git branch -a