From 68ef7f89aa58e6d25f5cb585265ed8d5a3938875 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 15 Jul 2019 10:36:15 +0200 Subject: [PATCH] phase1: checkout configured branch Also fixup the remote since the Git() step does not properly set it in all cases. Signed-off-by: Jo-Philipp Wich --- phase1/master.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index 676bfe2..a8abbc6 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -569,7 +569,7 @@ for target in targets: factory.addStep(ShellCommand( name = "gitcheckout", description = "Ensure that Git HEAD is sane", - command = "if [ -d .git ]; then git checkout master; else exit 0; fi", + command = "if [ -d .git ]; then git checkout %s; git branch --set-upstream-to origin/%s; else exit 0; fi" %(repo_branch, repo_branch), haltOnFailure = True)) # check out the source -- 2.30.2