From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 15 Jul 2019 08:36:15 +0000 (+0200)
Subject: phase1: checkout configured branch
X-Git-Tag: v1~83
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=68ef7f89aa58e6d25f5cb585265ed8d5a3938875;p=buildbot.git

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 <jo@mein.io>
---

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